Paul Hu
a5fe0f32f2
[automerger skipped] Merge "Add framework-connectivity-tiramisu to PRODUCT_APEX_BOOT_JARS" am: 89d7061ed3
am: d59bc31553
am: 32cfa4de74
-s ours
...
am skip reason: Merged-In I04a89be2145fa180de4a51c5056f41d7a94a7399 with SHA-1 74be28c733
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/1921477
Change-Id: I34c490aa6ca46f1b8642f94cd2fc43b46d7b8a31
2022-01-20 05:49:38 +00:00
Paul Hu
32cfa4de74
Merge "Add framework-connectivity-tiramisu to PRODUCT_APEX_BOOT_JARS" am: 89d7061ed3
am: d59bc31553
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1921477
Change-Id: Id907f9237ce0edb3b6d855639db88336fd954639
2022-01-20 05:37:22 +00:00
George Chang
5baca438e6
Add nfc HAL ndk to gsi
...
Bug: 204868826
Test: m
Change-Id: I5f590bcc401170b565fb6684ac343d84fb0bdc5e
2022-01-20 03:49:15 +00:00
Paul Hu
d59bc31553
Merge "Add framework-connectivity-tiramisu to PRODUCT_APEX_BOOT_JARS" am: 89d7061ed3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1921477
Change-Id: Id913c805ee00da54a413d2c6111d18b660781375
2022-01-20 03:25:17 +00:00
Paul Hu
89d7061ed3
Merge "Add framework-connectivity-tiramisu to PRODUCT_APEX_BOOT_JARS"
2022-01-20 03:02:56 +00:00
paulhu
40339b9e4b
[automerger skipped] Add framework-connectivity-tiramisu to PRODUCT_APEX_BOOT_JARS am: 74be28c733
-s ours
...
am skip reason: Merged-In I04a89be2145fa180de4a51c5056f41d7a94a7399 with SHA-1 627b72a105
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16670444
Change-Id: I3d3eec517c2cbed46490240006dc348a05d707db
2022-01-19 16:50:02 +00:00
Nicolas Geoffray
4ff406c4a1
Revert "Set an empty persist.sys.dalvik.vm.lib.2 to simplify debug apex testing."
...
This reverts commit 50930076a2
.
Bug: 214049018
Reason for revert: Not needed after all.
Change-Id: Ifbf3053fd70c5880e58136821a2fb8b783c48e2a
2022-01-19 16:22:07 +00:00
paulhu
74be28c733
Add framework-connectivity-tiramisu to PRODUCT_APEX_BOOT_JARS
...
framework-connectivity-tiramisu is the new jar in tethering apex
which is added since android T.
Bug: 206893064
Test: m
Merged-In: I04a89be2145fa180de4a51c5056f41d7a94a7399
Change-Id: I04a89be2145fa180de4a51c5056f41d7a94a7399
2022-01-19 11:04:30 +00:00
Pirama Arumuga Nainar
bc66932895
Merge "Revert "Set a BIONIC_COVERAGE .mk variable"" am: 5fe798bea0
am: 6332808700
am: 76c6975e05
am: dbdd594fae
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1953525
Change-Id: I375d4f488e78b9f6b7e9c9954d19bbd5eb69d8a7
2022-01-19 07:09:47 +00:00
Pirama Arumuga Nainar
dbdd594fae
Merge "Revert "Set a BIONIC_COVERAGE .mk variable"" am: 5fe798bea0
am: 6332808700
am: 76c6975e05
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1953525
Change-Id: Ic2454804d74ef2a3862a6b3ced172aefdbd9eccc
2022-01-19 06:51:32 +00:00
Pirama Arumuga Nainar
76c6975e05
Merge "Revert "Set a BIONIC_COVERAGE .mk variable"" am: 5fe798bea0
am: 6332808700
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1953525
Change-Id: I8d711cdaf94e5a88da0e863fde3bab56ab3aeb60
2022-01-19 06:33:30 +00:00
Pirama Arumuga Nainar
6332808700
Merge "Revert "Set a BIONIC_COVERAGE .mk variable"" am: 5fe798bea0
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1953525
Change-Id: I89fafa01cb74dc0ef5ba316f5ca95718978a7baa
2022-01-19 06:18:25 +00:00
Pirama Arumuga Nainar
5fe798bea0
Merge "Revert "Set a BIONIC_COVERAGE .mk variable""
2022-01-19 06:03:25 +00:00
Treehugger Robot
15423781f6
Merge "Add erofs compressor type param" am: d698e3e0b0
am: 8988b57027
am: 0a697caa2b
am: 6d70ba5041
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1949257
Change-Id: If9adb8f042daad86245b1a2b900429c37b53cd4d
2022-01-19 03:37:07 +00:00
Treehugger Robot
6d70ba5041
Merge "Add erofs compressor type param" am: d698e3e0b0
am: 8988b57027
am: 0a697caa2b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1949257
Change-Id: I9e05b94293861f47a4b731b85424cd4a4b418465
2022-01-19 03:12:38 +00:00
Treehugger Robot
0a697caa2b
Merge "Add erofs compressor type param" am: d698e3e0b0
am: 8988b57027
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1949257
Change-Id: I179329b9ee6643e457a5aabced2fee44f6693188
2022-01-19 02:59:19 +00:00
Treehugger Robot
8988b57027
Merge "Add erofs compressor type param" am: d698e3e0b0
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1949257
Change-Id: I069ef8bdb33a21d74276b4a9893636740cd42c41
2022-01-19 02:48:21 +00:00
Treehugger Robot
d698e3e0b0
Merge "Add erofs compressor type param"
2022-01-19 02:32:30 +00:00
Treehugger Robot
b179f9e6cf
Merge "Fix formatting error" am: 5d14dfa2fd
am: c5f019bf71
am: 286491047d
am: c717997920
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1952324
Change-Id: I37cc4c3de15bf4a6508b46e72d3e233b068e3e81
2022-01-19 01:01:00 +00:00
Treehugger Robot
c717997920
Merge "Fix formatting error" am: 5d14dfa2fd
am: c5f019bf71
am: 286491047d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1952324
Change-Id: Ibf506a74f468152f0775d88e96b8da99e6c4c831
2022-01-19 00:43:59 +00:00
Treehugger Robot
286491047d
Merge "Fix formatting error" am: 5d14dfa2fd
am: c5f019bf71
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1952324
Change-Id: If11a62ea3109b8d3b3d681819f676deda20de2f8
2022-01-19 00:28:29 +00:00
Treehugger Robot
c5f019bf71
Merge "Fix formatting error" am: 5d14dfa2fd
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1952324
Change-Id: I27ac194a487f1452b80db2d45355667c689b53a6
2022-01-19 00:10:39 +00:00
Treehugger Robot
5d14dfa2fd
Merge "Fix formatting error"
2022-01-18 23:51:38 +00:00
Bassem Khalife
c103118de7
[automerger skipped] Update security string to 2022-03-01 am: 389f21950c
am: eb389ab195
am: da539453f8
am: 0c1d6c0f4e
am: 8959f0ef47
am: 6b683065ea
am: 8c19435f5a
-s ours am: 50652dcb86
-s ours am: a95770686c
-s ours
...
am skip reason: Merged-In Ic0fb477acd4bd79c0ee464bf53b5d688f74e4863 with SHA-1 16caffd2e7
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16579523
Change-Id: I60354ddaac3d1b117fe9d00781a4d4f1c0d24bf5
2022-01-18 21:55:00 +00:00
Bassem Khalife
feb5eef283
[automerger skipped] Update security string to 2022-03-01 am: 389f21950c
am: eb389ab195
am: da539453f8
am: 0c1d6c0f4e
am: 87a92018fc
am: 6833559fbd
am: ac9415f174
-s ours am: b1bb19184b
-s ours am: 08c712f943
-s ours
...
am skip reason: Merged-In Ic0fb477acd4bd79c0ee464bf53b5d688f74e4863 with SHA-1 16caffd2e7
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16644783
Change-Id: Id2726d79768ba5b32c6c31f83d6c835194017db2
2022-01-18 21:54:51 +00:00
Bassem Khalife
cc50f9cb99
[automerger skipped] Update security string to 2022-03-01 am: 389f21950c
am: eb389ab195
am: da539453f8
am: 0c1d6c0f4e
am: 8959f0ef47
am: 6b683065ea
am: 8c19435f5a
am: 0511893cc1
-s ours am: 5340b221b8
-s ours
...
am skip reason: Merged-In Ic0fb477acd4bd79c0ee464bf53b5d688f74e4863 with SHA-1 16caffd2e7
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16579523
Change-Id: Id891429ab2e5babf85276af22ad490099dfec8a7
2022-01-18 21:54:44 +00:00
Bassem Khalife
0474990ab8
[automerger skipped] Update security string to 2022-03-01 am: 389f21950c
am: eb389ab195
am: da539453f8
am: 0c1d6c0f4e
am: 87a92018fc
am: 6833559fbd
am: ac9415f174
am: cfd95b84f7
-s ours am: 68923b6503
-s ours
...
am skip reason: Merged-In Ic0fb477acd4bd79c0ee464bf53b5d688f74e4863 with SHA-1 16caffd2e7
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16644783
Change-Id: I129a1ea16051e87338fc3086207901668364f4ad
2022-01-18 21:54:33 +00:00
TreeHugger Robot
5a28f4e497
Merge "Revert "Add GnssVisibilityControl AIDL to VNDK""
2022-01-18 21:39:45 +00:00
Bassem Khalife
a95770686c
[automerger skipped] Update security string to 2022-03-01 am: 389f21950c
am: eb389ab195
am: da539453f8
am: 0c1d6c0f4e
am: 8959f0ef47
am: 6b683065ea
am: 8c19435f5a
-s ours am: 50652dcb86
-s ours
...
am skip reason: Merged-In Ic0fb477acd4bd79c0ee464bf53b5d688f74e4863 with SHA-1 16caffd2e7
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16579523
Change-Id: Id62db712eca99326ad094008f2648bbd461318df
2022-01-18 21:37:28 +00:00
Bassem Khalife
08c712f943
[automerger skipped] Update security string to 2022-03-01 am: 389f21950c
am: eb389ab195
am: da539453f8
am: 0c1d6c0f4e
am: 87a92018fc
am: 6833559fbd
am: ac9415f174
-s ours am: b1bb19184b
-s ours
...
am skip reason: Merged-In Ic0fb477acd4bd79c0ee464bf53b5d688f74e4863 with SHA-1 16caffd2e7
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16644783
Change-Id: I6ed603d0190c9c326e108a33b45e156f8be3cdf7
2022-01-18 21:37:21 +00:00
Bassem Khalife
5340b221b8
[automerger skipped] Update security string to 2022-03-01 am: 389f21950c
am: eb389ab195
am: da539453f8
am: 0c1d6c0f4e
am: 8959f0ef47
am: 6b683065ea
am: 8c19435f5a
am: 0511893cc1
-s ours
...
am skip reason: Merged-In Ic0fb477acd4bd79c0ee464bf53b5d688f74e4863 with SHA-1 16caffd2e7
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16579523
Change-Id: I18893e5d10f490fcc6231371d75a4c8c0a02d14f
2022-01-18 21:36:53 +00:00
Bassem Khalife
68923b6503
[automerger skipped] Update security string to 2022-03-01 am: 389f21950c
am: eb389ab195
am: da539453f8
am: 0c1d6c0f4e
am: 87a92018fc
am: 6833559fbd
am: ac9415f174
am: cfd95b84f7
-s ours
...
am skip reason: Merged-In Ic0fb477acd4bd79c0ee464bf53b5d688f74e4863 with SHA-1 16caffd2e7
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16644783
Change-Id: If5ca6a86567dcbf9313f024471111fe46f3c9481
2022-01-18 21:36:44 +00:00
Bassem Khalife
0511893cc1
Update security string to 2022-03-01 am: 389f21950c
am: eb389ab195
am: da539453f8
am: 0c1d6c0f4e
am: 8959f0ef47
am: 6b683065ea
am: 8c19435f5a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16579523
Change-Id: I81bc523f134adb5d8367445e4b79d181ab8fbf1e
2022-01-18 21:17:25 +00:00
Bassem Khalife
cfd95b84f7
Update security string to 2022-03-01 am: 389f21950c
am: eb389ab195
am: da539453f8
am: 0c1d6c0f4e
am: 87a92018fc
am: 6833559fbd
am: ac9415f174
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16644783
Change-Id: I8ca46503a4d23d2aa915cce7b19260decbec656d
2022-01-18 21:17:07 +00:00
Bassem Khalife
50652dcb86
[automerger skipped] Update security string to 2022-03-01 am: 389f21950c
am: eb389ab195
am: da539453f8
am: 0c1d6c0f4e
am: 8959f0ef47
am: 6b683065ea
am: 8c19435f5a
-s ours
...
am skip reason: Merged-In Ic0fb477acd4bd79c0ee464bf53b5d688f74e4863 with SHA-1 16caffd2e7
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16579523
Change-Id: Ie7dee86ccc5529e6ebbc5bd19fa99cb639eb118e
2022-01-18 21:17:04 +00:00
Bassem Khalife
b1bb19184b
[automerger skipped] Update security string to 2022-03-01 am: 389f21950c
am: eb389ab195
am: da539453f8
am: 0c1d6c0f4e
am: 87a92018fc
am: 6833559fbd
am: ac9415f174
-s ours
...
am skip reason: Merged-In Ic0fb477acd4bd79c0ee464bf53b5d688f74e4863 with SHA-1 16caffd2e7
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16644783
Change-Id: I15b77b09b4587dcbc20bd2ffc4860a337261bf66
2022-01-18 21:16:58 +00:00
Pirama Arumuga Nainar
e6b8497408
Revert "Set a BIONIC_COVERAGE .mk variable"
...
This reverts commit b1b4e1e38b
.
Bug: http://b/194128476
Coverage metrics dropped for ~10 of the 40 modules. There are also
regressions in mainline when running tests on older platform builds.
Test: presubmit
Change-Id: Ib34f607292cd64e7cb9fe35c59a4f79b46904ab8
2022-01-18 13:09:01 -08:00
Bassem Khalife
8c19435f5a
Update security string to 2022-03-01 am: 389f21950c
am: eb389ab195
am: da539453f8
am: 0c1d6c0f4e
am: 8959f0ef47
am: 6b683065ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16579523
Change-Id: Ie211c616f7ad1336d6e082fc576df24b398cbb1c
2022-01-18 21:04:08 +00:00
Nikita Ioffe
22006fb420
Add services-supplementalprocess to system server classpath
...
Test: m
Bug: 212577961
Change-Id: If107d808ea712b50230f4b4d9a9baaf220a66252
2022-01-18 19:47:09 +00:00
Kelvin Zhang
988f92d7c5
Merge "Fix check_tf failure when duplicate package names are present" am: 4a376986ea
am: 6a7d589ed2
am: 68b0980e5b
am: 367d28b2c6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1949256
Change-Id: I232a775698ab70b0bf0cddeee9af55cb8af2652e
2022-01-18 19:31:51 +00:00
Kelvin Zhang
367d28b2c6
Merge "Fix check_tf failure when duplicate package names are present" am: 4a376986ea
am: 6a7d589ed2
am: 68b0980e5b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1949256
Change-Id: I84274b2c582f65de9c6cde16e34aaee48f05d29a
2022-01-18 19:12:41 +00:00
Kelvin Zhang
68b0980e5b
Merge "Fix check_tf failure when duplicate package names are present" am: 4a376986ea
am: 6a7d589ed2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1949256
Change-Id: Ifa39497508ea9ee28a5ea5d636fc3a6e37d70791
2022-01-18 18:55:33 +00:00
Kelvin Zhang
6a7d589ed2
Merge "Fix check_tf failure when duplicate package names are present" am: 4a376986ea
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1949256
Change-Id: Ief58b2f8ddd2683247b25433449310c5ffa98ecb
2022-01-18 18:38:37 +00:00
Kelvin Zhang
6fe2fc031f
Add erofs compressor type param
...
Test: th
Bug: 206729162
Change-Id: I3ddd1a55e1544a8a4d24ed445562f05ad0aaad2c
2022-01-18 10:17:49 -08:00
Kelvin Zhang
554c8bee14
Fix formatting error
...
Test: th
Bug: 214388458
Change-Id: I2dc72884aad4f440b4b68566e2e29f9f6f5aa73e
2022-01-18 10:17:49 -08:00
Kelvin Zhang
4a376986ea
Merge "Fix check_tf failure when duplicate package names are present"
2022-01-18 18:14:02 +00:00
Treehugger Robot
e2b5582b7f
Merge "Migrate java-event-logs-tags.py to python3." am: 6c38edc0b9
am: eb1391adb9
am: e330539009
am: d4df224693
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1948776
Change-Id: I039c3c56de57f6ec040499e0d7089bcd8b4638d8
2022-01-18 11:52:25 +00:00
Treehugger Robot
d4df224693
Merge "Migrate java-event-logs-tags.py to python3." am: 6c38edc0b9
am: eb1391adb9
am: e330539009
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1948776
Change-Id: I4d9c6ca7c05342b5b2bda029f195c85eb1808a48
2022-01-18 11:37:44 +00:00
Treehugger Robot
e330539009
Merge "Migrate java-event-logs-tags.py to python3." am: 6c38edc0b9
am: eb1391adb9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1948776
Change-Id: If653ae41c7111b41fd63e30303c276b96a9584bc
2022-01-18 10:55:23 +00:00
Treehugger Robot
eb1391adb9
Merge "Migrate java-event-logs-tags.py to python3." am: 6c38edc0b9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1948776
Change-Id: I3e4b448f5a51ff1ab940cfa9cc26867a3ae461d9
2022-01-18 10:19:11 +00:00