Chalard Jean
050d4a4bb0
Move module utils to the module package.
...
Test: builds
Change-Id: If5d1e4a58fb2d6d9544e6d01995dabe445cf1f25
(cherry picked from commit 046bf639eb7728504be35e30e3dd49af3d029728)
2020-09-26 14:12:10 +09:00
Remi NGUYEN VAN
1f7f7ae82a
Merge "Remove unused testutils lib from tethering tests" am: a8e68bb723 am: d8c1f0dc19 am: a3de2aa6d3 am: 3065a5df85 am: a38ddf0107
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433924
Change-Id: Ibbd6698b108ae67f0db7c435c8e7178e14ee1bb0
2020-09-24 10:11:18 +00:00
Remi NGUYEN VAN
a38ddf0107
Merge "Remove unused testutils lib from tethering tests" am: a8e68bb723 am: d8c1f0dc19 am: a3de2aa6d3 am: 3065a5df85
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433924
Change-Id: I6f7ded717faf6e801102e37863ff9477dde47c8a
2020-09-24 09:52:22 +00:00
Remi NGUYEN VAN
3065a5df85
Merge "Remove unused testutils lib from tethering tests" am: a8e68bb723 am: d8c1f0dc19 am: a3de2aa6d3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433924
Change-Id: Ib7d695934eb69c8e49e690d3d85198cf6f7b9ff4
2020-09-24 09:12:13 +00:00
Remi NGUYEN VAN
a3de2aa6d3
Merge "Remove unused testutils lib from tethering tests" am: a8e68bb723 am: d8c1f0dc19
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433924
Change-Id: I7229dab0c6246f9fbb6724456d9ada6064d3f31a
2020-09-24 08:52:46 +00:00
Remi NGUYEN VAN
d8c1f0dc19
Merge "Remove unused testutils lib from tethering tests" am: a8e68bb723
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433924
Change-Id: I30a1542c1fe2056d074402f2b5f7be2a37f15373
2020-09-24 08:35:35 +00:00
Remi NGUYEN VAN
a8e68bb723
Merge "Remove unused testutils lib from tethering tests"
2020-09-24 08:16:21 +00:00
Remi NGUYEN VAN
8f59ec090d
Remove unused testutils lib from tethering tests
...
frameworks-base-testutils is unused in tethering integration tests, so
the dependency can be removed.
That test library also contains test classes, so removing the dependency
allows tethering tests to stop running the associated tests.
Also add jarjar rules to the unit tests to zap (remove) the test classes
from the output APK. Ideally the unit tests should stop depending on
that library too (TestableLooper can be used instead of TestLooper), or
the frameworks-base-testutils library should stop including test
classes.
Bug: 167968946
Test: m CtsTetheringTest TetheringTests
Change-Id: Ie950ce5b6181e388a7f71da430fd2dd8ada32e49
2020-09-23 17:10:42 +09:00
Remi NGUYEN VAN
6432435cd4
Merge "tethering: DAD Proxy Daemon" am: 72e81859f8 am: 4508ee1e28 am: fa3997133c am: 149bcd9a8d am: de20384cf9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1258645
Change-Id: I35ed011484134d1952fc5b4ba8d4ff766bfcb447
2020-09-23 07:15:41 +00:00
Remi NGUYEN VAN
de20384cf9
Merge "tethering: DAD Proxy Daemon" am: 72e81859f8 am: 4508ee1e28 am: fa3997133c am: 149bcd9a8d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1258645
Change-Id: I3ca2718fbf0f7974627d432fb92724d617bcf44a
2020-09-23 06:56:53 +00:00
Remi NGUYEN VAN
149bcd9a8d
Merge "tethering: DAD Proxy Daemon" am: 72e81859f8 am: 4508ee1e28 am: fa3997133c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1258645
Change-Id: I308a9f5ba1b77fe1c3263a610354d76dc8b127ae
2020-09-23 06:19:15 +00:00
Remi NGUYEN VAN
fa3997133c
Merge "tethering: DAD Proxy Daemon" am: 72e81859f8 am: 4508ee1e28
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1258645
Change-Id: I25eb7ff486716156a11cfd4b1f15e789ce154a7c
2020-09-23 05:48:57 +00:00
Remi NGUYEN VAN
4508ee1e28
Merge "tethering: DAD Proxy Daemon" am: 72e81859f8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1258645
Change-Id: Ib3bbe465b698feace1a3ec1f6588cfa7bff0c9fd
2020-09-23 05:30:55 +00:00
Remi NGUYEN VAN
72e81859f8
Merge "tethering: DAD Proxy Daemon"
2020-09-23 04:57:42 +00:00
Tyler Wear
90e4063fd2
tethering: DAD Proxy Daemon
...
DAD proxy daemon responsible for forwarding NS/NA between
tethered iface and upstream iface.
Change-Id: I2e58e10e7fa7dba6a6f63ad03b000549f3afc37e
2020-09-22 11:58:49 -07:00
Bill Yi
aa93711b05
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 8c7f330e7a am: 6dbeee66e9 -s ours am: e1d6cd570c -s ours am: 90ba8b743e -s ours am: 9728001ba3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515
Change-Id: I98c9f5c3eb4bcf04506448220778841be7e4a48d
2020-09-21 08:28:07 +00:00
Bill Yi
defdc98152
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 725af62a59 am: 1138d178c4 -s ours am: 9dce16d237 -s ours am: 0b754492ac -s ours am: 19984fcbf0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515
Change-Id: Iab55ccd9cf2cfd9fbd2e3859059b03df35ff52ef
2020-09-21 08:27:05 +00:00
Bill Yi
9728001ba3
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 8c7f330e7a am: 6dbeee66e9 -s ours am: e1d6cd570c -s ours am: 90ba8b743e -s ours
...
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515
Change-Id: I908bcb9330b0e2cf00374276e1d8e5fa3fc67fab
2020-09-19 08:02:00 +00:00
Bill Yi
19984fcbf0
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 725af62a59 am: 1138d178c4 -s ours am: 9dce16d237 -s ours am: 0b754492ac -s ours
...
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515
Change-Id: I53f6598e1a8f06322ee1ec7f5c5979d2ab01c05b
2020-09-19 08:01:04 +00:00
Bill Yi
90ba8b743e
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 8c7f330e7a am: 6dbeee66e9 -s ours am: e1d6cd570c -s ours
...
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515
Change-Id: I18f6dabacb6e272e2d3fdf63a9220afc5572f2d2
2020-09-19 07:01:25 +00:00
Bill Yi
0b754492ac
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 725af62a59 am: 1138d178c4 -s ours am: 9dce16d237 -s ours
...
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515
Change-Id: Ib3e8b5c0678513b5128aaf106c8f8044bed09702
2020-09-19 07:00:58 +00:00
Bill Yi
e1d6cd570c
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 8c7f330e7a am: 6dbeee66e9 -s ours
...
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515
Change-Id: I2ad75dfe2a2109ea63eade0ed3edc40b92149a16
2020-09-19 05:51:33 +00:00
Bill Yi
9dce16d237
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 725af62a59 am: 1138d178c4 -s ours
...
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515
Change-Id: I4a14d0f2ef305f4f564e7e38134763a85fd09ad3
2020-09-19 05:50:36 +00:00
Bill Yi
6dbeee66e9
Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 8c7f330e7a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515
Change-Id: Iaa631aaca21a51d786f59801d317f27ee635c70f
2020-09-19 05:25:29 +00:00
Bill Yi
1138d178c4
Merge mainline-release 6664920 to master - DO NOT MERGE am: 725af62a59
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515
Change-Id: Id233d0d39ad2d63ae3e6d6128b631e149f68990e
2020-09-19 05:22:39 +00:00
Bill Yi
8c7f330e7a
Merge "Merge mainline-release 6664920 to master - DO NOT MERGE"
2020-09-18 18:47:48 +00:00
Nucca Chen
952cf756f8
Merge "Move BPF offload program from netd to mainline" am: c26848e7bd am: a0d6f9712b am: b463014633 am: 4286c98bb1 am: 9b597de75b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424189
Change-Id: I6e4c56e3d7b411cbe5a18af02fb076fc457f203a
2020-09-18 06:50:05 +00:00
Nucca Chen
9b597de75b
Merge "Move BPF offload program from netd to mainline" am: c26848e7bd am: a0d6f9712b am: b463014633 am: 4286c98bb1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424189
Change-Id: I476365339384f18bf1e5b3d1509d92d3380fbe35
2020-09-18 06:12:50 +00:00
Nucca Chen
4286c98bb1
Merge "Move BPF offload program from netd to mainline" am: c26848e7bd am: a0d6f9712b am: b463014633
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424189
Change-Id: I248a1e3d9aad6a1f632898faa59953f29ba14f5f
2020-09-18 05:36:25 +00:00
Bill Yi
725af62a59
Merge mainline-release 6664920 to master - DO NOT MERGE
...
Merged-In: Id04ea331831e8b26ba99478848392b40a92548d5
Change-Id: I888da0c9475f2d00602d917d2f58169f8d7c93a4
2020-09-17 21:56:59 -07:00
Nucca Chen
b463014633
Merge "Move BPF offload program from netd to mainline" am: c26848e7bd am: a0d6f9712b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424189
Change-Id: Ic90ce1bc5a5abd1eb515e5392b2980cdd001dc9f
2020-09-18 04:56:57 +00:00
Nucca Chen
a0d6f9712b
Merge "Move BPF offload program from netd to mainline" am: c26848e7bd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424189
Change-Id: Ia0b8a185f44dac7db365fcb9fc865a82bd552d62
2020-09-18 04:27:28 +00:00
Anton Hansson
81d1fd3c86
[automerger skipped] Merge "Simplify module visibility post build refactor" into mainline-prod am: f26c330295 -s ours
...
am skip reason: Change-Id Ibf35bfac5c99a21125f89ba10945f3364217b90f with SHA-1 9aed13818c is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12559475
Change-Id: I8acb421d671287e193d5d462788b3342ed193131
2020-09-17 01:47:44 +00:00
Makoto Onuki
0d642eba0c
[automerger skipped] Merge "Proper API hierarchy between MODULE_LIBS and PRIV_APPS system APIs" into mainline-prod am: 8e29b7caee -s ours
...
am skip reason: Change-Id Ie1ad6711c490c679ebcfacd97154380a8810ba1c with SHA-1 7197b67343 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12558117
Change-Id: I16620dd56e687da1a6230bb3ed7512b798822b8c
2020-09-16 19:08:42 +00:00
Hungming Chen
56c632caed
Move BPF offload program from netd to mainline
...
Test: as the follows.
$ adb shell ls sys/fs/bpf | grep offload
map_offload_tether_ingress_map
map_offload_tether_limit_map
map_offload_tether_stats_map
prog_offload_schedcls_ingress_tether_ether
prog_offload_schedcls_ingress_tether_rawip
$ adb shell dumpsys netd --short
TetherController
BPF ingress map: iif(iface) v6addr -> oif(iface) srcmac ..
13(rmnet_data3) 2401:e180:8842:6e3:bc6a:2e45:c30:f418 -> ..
BPF stats (downlink): iif(iface) -> packets bytes errors
13(rmnet_data3) -> 7 488 0
BPF limit: iif(iface) -> bytes
13(rmnet_data3) -> 9223372036854775807
Log:
bpfloader: Loaded object: /apex/com.android.tethering/etc/bpf/offload.o
Change-Id: I71b7efb1f4bd6eb1cd469a0e1e4a56342dc6e579
2020-09-16 20:38:14 +08:00
Bill Yi
8c86a215ae
[automerger skipped] Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 938d3bb1f5 -s ours am: 38436142ff -s ours am: 509872d525 -s ours am: ebe91344a0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12577741
Change-Id: I1713ac8976730a0e6a414cf0e761f7f0267cf51e
2020-09-15 20:32:15 +00:00
Bill Yi
ebe91344a0
[automerger skipped] Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 938d3bb1f5 -s ours am: 38436142ff -s ours am: 509872d525 -s ours
...
am skip reason: Change-Id I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6 with SHA-1 f72a5498af is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12577741
Change-Id: I36d5555b5fa23140e4916f568353af25b579c653
2020-09-14 22:20:16 +00:00
Bill Yi
509872d525
[automerger skipped] Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 938d3bb1f5 -s ours am: 38436142ff -s ours
...
am skip reason: Change-Id I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6 with SHA-1 f72a5498af is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12577741
Change-Id: I0fe501d77d176eb43d9e308e7fe3e01c579f22bb
2020-09-14 21:50:56 +00:00
Bill Yi
38436142ff
[automerger skipped] Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 938d3bb1f5 -s ours
...
am skip reason: Change-Id I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6 with SHA-1 f72a5498af is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12577741
Change-Id: I9b5e1a916081cb266eaca328b86506481e938c7f
2020-09-14 21:18:54 +00:00
Anton Hansson
f26c330295
Merge "Simplify module visibility post build refactor" into mainline-prod
2020-09-14 14:14:15 +00:00
Bill Yi
8780ad918d
Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE
...
Merged-In: I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6
Change-Id: If78e130888b8d4653ef128d747e18cc46844d732
2020-09-13 07:58:42 -07:00
Xin Li
90eabb1afb
[automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am: b9db5b54f6 -s ours am: b7fcf57c8d -s ours am: d0d979b032 -s ours am: c20bf732b1 -s ours
...
am skip reason: Change-Id Ice3e441cc9c0df8d0a6acc016bb74375e081bd67 with SHA-1 ec82033d3e is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1422395
Change-Id: Iaa8c8357dffc8b79db12607cf6bf182ed6a62e74
2020-09-11 21:27:28 +00:00
Makoto Onuki
3ef6c1ef26
Proper API hierarchy between MODULE_LIBS and PRIV_APPS system APIs
...
Exempt-From-Owner-Approval: Cherry-picking from master
Test: build / treehugger
Bug: 146727827
Change-Id: Ie1ad6711c490c679ebcfacd97154380a8810ba1c
Merged-in: Ie1ad6711c490c679ebcfacd97154380a8810ba1c
2020-09-11 15:34:15 +00:00
Anton Hansson
ddaad5c538
Simplify module visibility post build refactor
...
//visibility:override is no longer needed for impl_library_visibility
to override visibility.
Removing this allows the defaults module to specify better defaults.
- Stub libraries are made publicly visible, via `visibility`
- Impl libraries are private by default, but visibility is extended
by the modules
Bug: 165017290
Test: m
Exempt-From-Owner-Approval: build refactor
Change-Id: Ibf35bfac5c99a21125f89ba10945f3364217b90f
Merged-In: Ibf35bfac5c99a21125f89ba10945f3364217b90f
(cherry picked from commit 9aed13818c )
2020-09-11 13:21:32 +01:00
Xin Li
c20bf732b1
[automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am: b9db5b54f6 -s ours am: b7fcf57c8d -s ours am: d0d979b032 -s ours
...
am skip reason: Change-Id Ice3e441cc9c0df8d0a6acc016bb74375e081bd67 with SHA-1 ec82033d3e is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1422395
Change-Id: I47087cabc2093c6de6116f11f660aa624dcb260e
2020-09-11 03:58:59 +00:00
Xin Li
d0d979b032
[automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am: b9db5b54f6 -s ours am: b7fcf57c8d -s ours
...
am skip reason: Change-Id Ice3e441cc9c0df8d0a6acc016bb74375e081bd67 with SHA-1 ec82033d3e is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1422395
Change-Id: Idcd3d30dddc7818975b50aee1b253e37608a3eae
2020-09-11 03:33:28 +00:00
Xin Li
b7fcf57c8d
[automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am: b9db5b54f6 -s ours
...
am skip reason: Change-Id Ice3e441cc9c0df8d0a6acc016bb74375e081bd67 with SHA-1 ec82033d3e is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1422395
Change-Id: Ie915db11679ce05f5d37815028015f61ffb1a4a6
2020-09-11 02:02:37 +00:00
Anton Hansson
5aa8e25cdd
Merge mainline-prod into master
...
$ git merge -s ours origin/mainline-prod
There are only two commits not from upstream:
a732b3a5a2
1be2664406a2e697044f483a44c547973f915e3d
But both of these are noops in master (due to Merged-In).
Bug: 168176832
Test: presubmit
Change-Id: Ic61fc2939b03615e152c37fd762dbcd81546f705
2020-09-10 08:18:00 +00:00
Xin Li
3b8bfc4811
Merge Android R
...
Bug: 168057903
Merged-In: Ice3e441cc9c0df8d0a6acc016bb74375e081bd67
Change-Id: I1d85742f594be2007c99841b290e502b6ede624e
2020-09-09 20:21:10 -07:00
Anton Hansson
7299c8ba41
Merge "Simplify module visibility post build refactor" into stage-aosp-master am: f94c8eb54f am: 6ab81ec60a am: 4900454137 am: 743fd239c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513172
Change-Id: I17a53b8879902fdf66f434b3115391a79c8d95dd
2020-09-07 09:31:51 +00:00