Commit Graph

794 Commits

Author SHA1 Message Date
Jooyung Han
ff15621dd9 Merge "Add min_sdk_version:R to updatable apexes" into rvc-dev am: 6a4a96c74c am: 39d545982e am: 3c6dfcf00d
Change-Id: Ife4b7e1bb4797eccc385cc58ca60103af71fc92f
2020-04-05 01:20:11 +00:00
Jooyung Han
3c6dfcf00d Merge "Add min_sdk_version:R to updatable apexes" into rvc-dev am: 6a4a96c74c am: 39d545982e
Change-Id: I1d48c1fd48d6c0771ee73e8dcf216e52524319b4
2020-04-05 01:02:18 +00:00
Jooyung Han
39d545982e Merge "Add min_sdk_version:R to updatable apexes" into rvc-dev am: 6a4a96c74c
Change-Id: I531247560c84d3cc49459d340f6c2d6cf6b31141
2020-04-05 00:32:14 +00:00
Lorenzo Colitti
674256af64 Merge "Add a test for static IPv4 address tethering configuration." am: 9a920cb92e am: b3c0b9205f am: d233c3c1db am: 24a3188dd7
Change-Id: I20eac5fd1c367e7ddbee05065b6b728a27cfb11c
2020-04-03 09:24:12 +00:00
Lorenzo Colitti
24a3188dd7 Merge "Add a test for static IPv4 address tethering configuration." am: 9a920cb92e am: b3c0b9205f am: d233c3c1db
Change-Id: I3ca6865c2fad4dfaef44f44fe38c32e863245492
2020-04-03 09:04:48 +00:00
Lorenzo Colitti
d233c3c1db Merge "Add a test for static IPv4 address tethering configuration." am: 9a920cb92e am: b3c0b9205f
Change-Id: I211d8e6a19d56d79afe3ad894b8398f4c36d0e9f
2020-04-03 08:41:51 +00:00
Lorenzo Colitti
b3c0b9205f Merge "Add a test for static IPv4 address tethering configuration." am: 9a920cb92e
Change-Id: I592468bf53ff925ec4ee8a04fee20404594237fe
2020-04-03 08:31:39 +00:00
Lorenzo Colitti
cfd82d4361 Add a test for static IPv4 address tethering configuration.
Bug: 150644681
Test: test-only change
Change-Id: I8f4a99da2351fdb5467f561a9732b14a8ebf674b
2020-04-03 10:47:47 +09:00
Jooyung Han
f1460fad52 Add min_sdk_version:R to updatable apexes
APEXes introduced in R need to set min_sdk_version to ensure that they
are built against correct version(30 or R) of stubs (libc/liblog/...).

Bug: 152655956
Test: /vendor/google/build/build_mainline_modules.sh
Change-Id: I4a893c34b09334eea124266287301e479b9e8a59
2020-04-02 13:54:06 +00:00
Lorenzo Colitti
a1d00c325e [automerger skipped] Merge "Add an Ethernet tethering test." into rvc-dev am: 57827f67e0 am: b326d28ff9 am: 538a5e145e am: 9f1af1dbc1 -s ours
am skip reason: Change-Id Ifcda70b73848b1fd4c26b031e53f0a6500cc93d4 with SHA-1 eb73310727 is in history

Change-Id: I8bbd099d0495ad315f46a16e07e12c1fd33460f9
2020-04-01 04:47:01 +00:00
Lorenzo Colitti
6cf628080b [automerger skipped] Merge "Add an Ethernet tethering test." into rvc-dev am: 57827f67e0 -s ours am: 8a30564015 -s ours am: 5b6c34808a -s ours
am skip reason: Change-Id Ifcda70b73848b1fd4c26b031e53f0a6500cc93d4 with SHA-1 eb73310727 is in history

Change-Id: I92f1485eac9fe9f5e25c66477191345bea115e33
2020-04-01 04:34:30 +00:00
Lorenzo Colitti
9f1af1dbc1 Merge "Add an Ethernet tethering test." into rvc-dev am: 57827f67e0 am: b326d28ff9 am: 538a5e145e
Change-Id: Iea225dfd81eb2b146a679b1f40999c86fbb3fe9a
2020-04-01 04:34:30 +00:00
Lorenzo Colitti
a23576d00b [automerger skipped] Merge "Add an Ethernet tethering test." into rvc-dev am: 57827f67e0 am: b326d28ff9 -s ours am: 6330aa851c -s ours
am skip reason: Change-Id Ifcda70b73848b1fd4c26b031e53f0a6500cc93d4 with SHA-1 4896e3200f is in history

Change-Id: I7a3c2adca426893e62e215f5ecbace67f0ccdfea
2020-04-01 04:34:05 +00:00
Lorenzo Colitti
5b6c34808a [automerger skipped] Merge "Add an Ethernet tethering test." into rvc-dev am: 57827f67e0 -s ours am: 8a30564015 -s ours
am skip reason: Change-Id Ifcda70b73848b1fd4c26b031e53f0a6500cc93d4 with SHA-1 4896e3200f is in history

Change-Id: Ia4e445ae925e3767787bad2551ed8dff53aef3eb
2020-04-01 04:21:55 +00:00
Lorenzo Colitti
6330aa851c [automerger skipped] Merge "Add an Ethernet tethering test." into rvc-dev am: 57827f67e0 am: b326d28ff9 -s ours
am skip reason: Change-Id Ifcda70b73848b1fd4c26b031e53f0a6500cc93d4 with SHA-1 4896e3200f is in history

Change-Id: I3d6df9dafa804f97171a820547c2713f518006ca
2020-04-01 04:21:39 +00:00
Lorenzo Colitti
b326d28ff9 Merge "Add an Ethernet tethering test." into rvc-dev am: 57827f67e0
Change-Id: I6be7379914fcaade0177d661d5e80ba5031b50d7
2020-04-01 04:08:00 +00:00
Lorenzo Colitti
8a30564015 [automerger skipped] Merge "Add an Ethernet tethering test." into rvc-dev am: 57827f67e0 -s ours
am skip reason: Change-Id Ifcda70b73848b1fd4c26b031e53f0a6500cc93d4 with SHA-1 4896e3200f is in history

Change-Id: Ib24fee25c1aedfe1a18d039141be032b4503c9f0
2020-04-01 04:07:46 +00:00
Lorenzo Colitti
57827f67e0 Merge "Add an Ethernet tethering test." into rvc-dev 2020-04-01 03:56:28 +00:00
Anton Hansson
0af5bd283a [automerger skipped] Merge "Feed framework-tethering-stubs the src filegroup" am: f7a2a2d4ae am: edd558b244 -s ours am: c866875727 -s ours am: cafb176e27 -s ours
am skip reason: Change-Id I5b9ffa211be9c1a7dd8f63d5e7ba2a825d0d3190 with SHA-1 90ae90b6e0 is in history

Change-Id: I5e2b591a9cad882c8b00b4cf7e7a17674a53b838
2020-03-31 20:27:29 +00:00
Anton Hansson
cafb176e27 [automerger skipped] Merge "Feed framework-tethering-stubs the src filegroup" am: f7a2a2d4ae am: edd558b244 -s ours am: c866875727 -s ours
am skip reason: Change-Id I5b9ffa211be9c1a7dd8f63d5e7ba2a825d0d3190 with SHA-1 90ae90b6e0 is in history

Change-Id: I64f33c660d24075e5eca1aa075b04a6655dc5053
2020-03-31 19:14:51 +00:00
Anton Hansson
b89e093149 [automerger skipped] Merge "Make framework-tethering stubs use the new defaults" am: fb38e85a50 am: 1de34ce81b -s ours am: dae9d36d40 -s ours am: e3a0261d66 -s ours
am skip reason: Change-Id I330133824e78b3a8927e3d3ffbbd729bcdcb8822 with SHA-1 7939cb0a4a is in history

Change-Id: I08e121ca4442cdd08a05b94147e5d89396cff06f
2020-03-31 18:30:28 +00:00
Anton Hansson
f7927f781e [automerger skipped] Merge "Build tethering against the module SDK" am: 6abf8e41f7 am: fdcab3c71c -s ours am: 82b68376aa -s ours am: 4712f7a266 -s ours
am skip reason: Change-Id I7c93b60654e21a4a27d21cbf0c2a6cb21f813529 with SHA-1 aaeaa195b8 is in history

Change-Id: If20d733e14df608a6fa0869ca6b3eb15bc26fea2
2020-03-31 18:29:22 +00:00
Anton Hansson
e3a0261d66 [automerger skipped] Merge "Make framework-tethering stubs use the new defaults" am: fb38e85a50 am: 1de34ce81b -s ours am: dae9d36d40 -s ours
am skip reason: Change-Id I330133824e78b3a8927e3d3ffbbd729bcdcb8822 with SHA-1 7939cb0a4a is in history

Change-Id: Ie16de83afa55c813acb191b3b77252eb60db7bd4
2020-03-31 18:09:19 +00:00
Anton Hansson
4712f7a266 [automerger skipped] Merge "Build tethering against the module SDK" am: 6abf8e41f7 am: fdcab3c71c -s ours am: 82b68376aa -s ours
am skip reason: Change-Id I7c93b60654e21a4a27d21cbf0c2a6cb21f813529 with SHA-1 aaeaa195b8 is in history

Change-Id: Ib7290fef2146de35335dfbab67bde94011f8cd4f
2020-03-31 18:09:03 +00:00
Treehugger Robot
7f34b15526 Merge "Assign specific client address to dhcp server" am: 037becbf64 am: 815ab636c3 am: a3fbca5f60 am: d93de672d1
Change-Id: I324de55833b2426502ada2ac36cdfda0a022e84e
2020-03-31 18:01:33 +00:00
Remi NGUYEN VAN
eb7fbdd42c [automerger skipped] Merge "Create a builder for NetworkCapabilities." am: b3289466c5 am: 2692eab096 -s ours am: f3d6eb3da9 -s ours am: 3ec724b979 -s ours
am skip reason: Change-Id I06eb97e50d5583579b3c26d1365d2dbaec8bfc99 with SHA-1 db3d568139 is in history

Change-Id: I8f96e4066e1a78b7f60e3488ac73669a2c9bfb6e
2020-03-31 18:00:26 +00:00
Treehugger Robot
d93de672d1 Merge "Assign specific client address to dhcp server" am: 037becbf64 am: 815ab636c3 am: a3fbca5f60
Change-Id: I104a19580179abda5bdeb5086a269b50b7fb074b
2020-03-31 17:47:25 +00:00
Remi NGUYEN VAN
3ec724b979 [automerger skipped] Merge "Create a builder for NetworkCapabilities." am: b3289466c5 am: 2692eab096 -s ours am: f3d6eb3da9 -s ours
am skip reason: Change-Id I06eb97e50d5583579b3c26d1365d2dbaec8bfc99 with SHA-1 db3d568139 is in history

Change-Id: I5b57ee16e81765981fb4154aa27c1be4ecb85d02
2020-03-31 17:44:07 +00:00
Android Build Merger (Role)
cbe03df318 Merge "Merge "Use CompletableFuture instead of a latch." am: a5f8e9b3d7 am: 9cc9f6b471 am: f27f2ae4bb" into rvc-d1-dev-plus-aosp am: 1b64249120
Change-Id: Ibcad3cee0cb55370ae7ad05f864110029f8fb4d0
2020-03-31 17:43:30 +00:00
Lorenzo Colitti
76052fca77 Merge "Use CompletableFuture instead of a latch." am: a5f8e9b3d7 am: 9cc9f6b471
am: f27f2ae4bb

Change-Id: I5e1a437c17857e9d4147df5e4459bca0d543fc3a
2020-03-31 10:40:11 -07:00
Anton Hansson
c866875727 [automerger skipped] Merge "Feed framework-tethering-stubs the src filegroup" am: f7a2a2d4ae am: edd558b244 -s ours
am skip reason: Change-Id I5b9ffa211be9c1a7dd8f63d5e7ba2a825d0d3190 with SHA-1 90ae90b6e0 is in history

Change-Id: If0728ff3de015e338161f538dc3aea83808952ba
2020-03-31 12:12:23 +00:00
Anton Hansson
edd558b244 Merge "Feed framework-tethering-stubs the src filegroup" am: f7a2a2d4ae
Change-Id: Ib9e7dd7756dd4b6cf3f72c009a26075b3132e6be
2020-03-31 11:55:37 +00:00
Anton Hansson
f7a2a2d4ae Merge "Feed framework-tethering-stubs the src filegroup" 2020-03-31 11:39:40 +00:00
Anton Hansson
cdc8658403 Feed framework-tethering-stubs the src filegroup
This filegroups strips the "src" prefix away from the src path
for the filter_packages check in droiddoc.

Bug: 149293194
Test: m update-api (no change)
Change-Id: I5b9ffa211be9c1a7dd8f63d5e7ba2a825d0d3190
Merged-In: I5b9ffa211be9c1a7dd8f63d5e7ba2a825d0d3190
2020-03-31 09:56:55 +01:00
Anton Hansson
dae9d36d40 [automerger skipped] Merge "Make framework-tethering stubs use the new defaults" am: fb38e85a50 am: 1de34ce81b -s ours
am skip reason: Change-Id I330133824e78b3a8927e3d3ffbbd729bcdcb8822 with SHA-1 7939cb0a4a is in history

Change-Id: Ib1172487afd1fdfea82b83099ebfc60101afc6c0
2020-03-30 15:10:56 +00:00
Anton Hansson
82b68376aa [automerger skipped] Merge "Build tethering against the module SDK" am: 6abf8e41f7 am: fdcab3c71c -s ours
am skip reason: Change-Id I7c93b60654e21a4a27d21cbf0c2a6cb21f813529 with SHA-1 aaeaa195b8 is in history

Change-Id: I1f1e4179236397649989ed7bff24d99ed5bada6b
2020-03-30 15:10:31 +00:00
Anton Hansson
1de34ce81b Merge "Make framework-tethering stubs use the new defaults" am: fb38e85a50
Change-Id: I148fcec861b97fbead0884918bff4e1560fab23d
2020-03-30 14:47:33 +00:00
Anton Hansson
fdcab3c71c Merge "Build tethering against the module SDK" am: 6abf8e41f7
Change-Id: If720371eac2acc92677a15f7c0c5ae55c84023a6
2020-03-30 14:47:06 +00:00
Anton Hansson
fb38e85a50 Merge "Make framework-tethering stubs use the new defaults" 2020-03-30 14:16:02 +00:00
Anton Hansson
6abf8e41f7 Merge "Build tethering against the module SDK" 2020-03-30 14:15:42 +00:00
Treehugger Robot
a3fbca5f60 Merge "Assign specific client address to dhcp server" am: 037becbf64 am: 815ab636c3
Change-Id: Ia0e4a913faa5eac5d5ccba837eb7774d59670d27
2020-03-30 04:23:55 +00:00
Treehugger Robot
815ab636c3 Merge "Assign specific client address to dhcp server" am: 037becbf64
Change-Id: Ic5b645bb62a1b62ab010a9fa50427e1a1fc8ff01
2020-03-30 04:06:29 +00:00
Remi NGUYEN VAN
f3d6eb3da9 [automerger skipped] Merge "Create a builder for NetworkCapabilities." am: b3289466c5 am: 2692eab096 -s ours
am skip reason: Change-Id I06eb97e50d5583579b3c26d1365d2dbaec8bfc99 with SHA-1 db3d568139 is in history

Change-Id: Id4a9f21ae303960d29835443517cc7ae7c87f470
2020-03-30 03:40:28 +00:00
Lorenzo Colitti
f27f2ae4bb Merge "Use CompletableFuture instead of a latch." am: a5f8e9b3d7 am: 9cc9f6b471
Change-Id: I1967dcb1a51cedb110a47ed5ad14e4e71f95adf3
2020-03-30 03:38:51 +00:00
Treehugger Robot
037becbf64 Merge "Assign specific client address to dhcp server" 2020-03-30 03:38:46 +00:00
Remi NGUYEN VAN
2692eab096 Merge "Create a builder for NetworkCapabilities." am: b3289466c5
Change-Id: I2c78de7b501edca618441040fbe76e34ce15b08e
2020-03-30 03:06:07 +00:00
Remi NGUYEN VAN
b3289466c5 Merge "Create a builder for NetworkCapabilities." 2020-03-30 02:58:45 +00:00
Lorenzo Colitti
9cc9f6b471 Merge "Use CompletableFuture instead of a latch." am: a5f8e9b3d7
Change-Id: Ia6595e18ac62862f8458efb0fc4523f64795d9ca
2020-03-30 02:50:18 +00:00
TreeHugger Robot
4b86077ac3 [automerger skipped] Merge "Import translations. DO NOT MERGE" into mainline-prod am: 2a0a236ed0 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib1672eff3412a595a8821f71af247a774238a372
2020-03-28 18:09:28 +00:00
TreeHugger Robot
2a0a236ed0 Merge "Import translations. DO NOT MERGE" into mainline-prod 2020-03-28 18:08:07 +00:00