Treehugger Robot
0817f06f2a
Merge "Emit virtual_ab_compression prop to dynamic_parttiion_info.txt" am: 6e455b8ca3
am: f72ca016c5
am: 9c3a698d81
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1552075
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9451f3369aabbb932eda4054adcfc00f015302c1
2021-01-20 20:48:45 +00:00
Treehugger Robot
9c3a698d81
Merge "Emit virtual_ab_compression prop to dynamic_parttiion_info.txt" am: 6e455b8ca3
am: f72ca016c5
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1552075
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5960b29e78c0ef686fc1bdc8df08fa4baeb651d0
2021-01-20 20:26:30 +00:00
Treehugger Robot
f72ca016c5
Merge "Emit virtual_ab_compression prop to dynamic_parttiion_info.txt" am: 6e455b8ca3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1552075
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I393b61215715909cd4152952e92fe4442b630afe
2021-01-20 19:58:53 +00:00
Nicolas Geoffray
725914d50c
Merge "Remove unused variables." am: c6c4f08a8c
am: b98ed68c82
am: f2b59e29ed
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1555115
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9a875a1be9c80cb46689785aff00873f564e8dac
2021-01-20 19:47:31 +00:00
Ulyana Trafimovich
caefb3928d
Merge "Do not suppress compilation of boot images because of TARGET_BUILD_APPS." am: 8951930f21
am: 4eac0ed414
am: b47a19bff4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1555114
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I07ec1ad63d62694716ad0aa62cfb208099c9c3e7
2021-01-20 19:46:47 +00:00
Bill Peckham
3cec0ecc6b
Merge "Enable prebuilt hiddenapi CSV files." am: ddf8f61ce5
am: c72d8d348e
am: 6ec41325da
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1543720
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9e0e8b4794262b4fa059bb55d40489a50d796e0b
2021-01-20 19:46:31 +00:00
Treehugger Robot
6e455b8ca3
Merge "Emit virtual_ab_compression prop to dynamic_parttiion_info.txt"
2021-01-20 19:04:11 +00:00
Nicolas Geoffray
f2b59e29ed
Merge "Remove unused variables." am: c6c4f08a8c
am: b98ed68c82
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1555115
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7817653e9f35c9566f34b6d22185abc016f0acf0
2021-01-20 19:02:51 +00:00
Ulyana Trafimovich
b47a19bff4
Merge "Do not suppress compilation of boot images because of TARGET_BUILD_APPS." am: 8951930f21
am: 4eac0ed414
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1555114
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5a066693a039a0cf078cd36a41987ab1d73a3c76
2021-01-20 19:02:18 +00:00
Bill Peckham
6ec41325da
Merge "Enable prebuilt hiddenapi CSV files." am: ddf8f61ce5
am: c72d8d348e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1543720
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iba6528b59aa5af4ab66d6d131dec2ef0d79ee007
2021-01-20 19:02:05 +00:00
Nicolas Geoffray
b98ed68c82
Merge "Remove unused variables." am: c6c4f08a8c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1555115
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7d21d2f3cc4e2e3032fc552f1cc76512be5e4a59
2021-01-20 18:24:26 +00:00
Ulyana Trafimovich
4eac0ed414
Merge "Do not suppress compilation of boot images because of TARGET_BUILD_APPS." am: 8951930f21
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1555114
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id0da372aa78783b67ccfcd0dea1de2029e9424f1
2021-01-20 18:22:57 +00:00
Bill Peckham
c72d8d348e
Merge "Enable prebuilt hiddenapi CSV files." am: ddf8f61ce5
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1543720
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I739a20c15dfaf56efbe9e5fb8f805edb8fa5b0db
2021-01-20 18:22:17 +00:00
Nicolas Geoffray
c6c4f08a8c
Merge "Remove unused variables."
2021-01-20 18:13:20 +00:00
Ulyana Trafimovich
8951930f21
Merge "Do not suppress compilation of boot images because of TARGET_BUILD_APPS."
2021-01-20 17:46:02 +00:00
Bill Peckham
ddf8f61ce5
Merge "Enable prebuilt hiddenapi CSV files."
2021-01-20 17:43:48 +00:00
Nicolas Geoffray
ed9395a929
Remove unused variables.
...
Test: m
Bug: 176171716
Change-Id: I203d08607688ae6f165f0d5c7eee5d13c61eeefa
2021-01-20 14:32:55 +00:00
Ulya Trafimovich
7f8b7a1123
Do not suppress compilation of boot images because of TARGET_BUILD_APPS.
...
Bug: 176171716
Test: build_mainline_modules.sh and ensure that the ART boot image is
built: `find out -type f -name '*.art'` is nonempty for every arch.
Change-Id: I5163ebe1f8db3d4d921bab0f83cd388ba29419ec
2021-01-20 14:04:30 +00:00
Ulya Trafimovich
347be4037e
resolve merge conflicts of 56bf7ca8c9
to master
...
Test: DIST_DIR=$PWD/dist \
TARGET_BUILD_VARIANT=userdebug \
vendor/google/build/build_mainline_modules.sh
Bug: None
Change-Id: I66049dfb90c2583ea6687ac3353e3ce3eb973bd4
2021-01-20 12:44:40 +00:00
Treehugger Robot
56bf7ca8c9
Merge "Split out minimal ART dexpreopt config and use it in mainline builds." am: c895a8a817
am: 6cd9e2e320
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1551610
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If1ce15195c885c168155c2673efbd7a6a6646f80
2021-01-20 11:32:07 +00:00
Yo Chiang
5a9a5cfc8e
Merge "Specify --ramdisk_name for vendor ramdisks for vendor_boot v4" am: 865fd0c010
am: 0043087ddb
am: 713ac0e3f1
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1554180
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I394a2ad17947f45f2505bff505cef0698405b1ef
2021-01-20 11:15:22 +00:00
Treehugger Robot
6cd9e2e320
Merge "Split out minimal ART dexpreopt config and use it in mainline builds." am: c895a8a817
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1551610
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iba7de00ee38c1bc08978a87228108f47059f2683
2021-01-20 11:07:36 +00:00
Treehugger Robot
c895a8a817
Merge "Split out minimal ART dexpreopt config and use it in mainline builds."
2021-01-20 10:04:39 +00:00
Yo Chiang
713ac0e3f1
Merge "Specify --ramdisk_name for vendor ramdisks for vendor_boot v4" am: 865fd0c010
am: 0043087ddb
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1554180
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If4d069288595c7da8709f4c0bf5dc216bd07dddb
2021-01-20 09:55:13 +00:00
Yo Chiang
0043087ddb
Merge "Specify --ramdisk_name for vendor ramdisks for vendor_boot v4" am: 865fd0c010
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1554180
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I62fb998cba3e45fb5b1fd610cdeefece1f47c3a0
2021-01-20 09:32:28 +00:00
Yo Chiang
865fd0c010
Merge "Specify --ramdisk_name for vendor ramdisks for vendor_boot v4"
2021-01-20 08:50:30 +00:00
Nicolas Geoffray
201137821b
[automerger skipped] Merge "Revert "[DO NOT MERGE] iorap: Turn off iorap for R before resolving the regression. am: b73d551613"" into rvc-qpr-dev-plus-aosp am: 9cae0f5c69
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13369272
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3b518938a1dca6ca8225c1b9d86d8d810a368b63
2021-01-20 08:46:34 +00:00
Nicolas Geoffray
9cae0f5c69
Merge "Revert "[DO NOT MERGE] iorap: Turn off iorap for R before resolving the regression. am: b73d551613"" into rvc-qpr-dev-plus-aosp
2021-01-20 08:08:17 +00:00
Nicolas Geoffray
4e9e2eef4e
Merge changes from topic "presubmit-am-849340d36005440ab2b6684a04140eb6"
...
* changes:
[automerged blank] Revert "[DO NOT MERGE] iorap: Turn off iorap for R before resolving the regression. am: b73d551613" 2p: caf47e29d1
Revert "[DO NOT MERGE] iorap: Turn off iorap for R before resolving the regression. am: b73d551613"
2021-01-20 08:08:17 +00:00
Yo Chiang
0d6ffe8c50
Merge "Remove PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE from gsi_release.mk" am: 95bd22edb6
am: b09c7adb3e
am: cb3275e0a5
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1553834
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6857c6a67d91074a9f71bf6410c78efaa4a2a06d
2021-01-20 04:06:01 +00:00
Yo Chiang
cb3275e0a5
Merge "Remove PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE from gsi_release.mk" am: 95bd22edb6
am: b09c7adb3e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1553834
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I20108c9f0999134ac2838638c5b6abedea9278d9
2021-01-20 04:05:37 +00:00
Treehugger Robot
2f7ac761df
Merge "Includes recovery resources into vendor_boot-debug.img" am: b45217bdc4
am: 864085f9df
am: 238b7eed67
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1554176
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icf01fbc3cab24169e458aaae3bde68a0d4f41b6c
2021-01-20 04:05:19 +00:00
Yo Chiang
b09c7adb3e
Merge "Remove PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE from gsi_release.mk" am: 95bd22edb6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1553834
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic00f031ed171a4fa7f8d64f0b5daccf185a8c26a
2021-01-20 03:44:26 +00:00
Treehugger Robot
238b7eed67
Merge "Includes recovery resources into vendor_boot-debug.img" am: b45217bdc4
am: 864085f9df
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1554176
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3be5820d7b7630fd00cc22f69b8efc391905c33f
2021-01-20 03:37:32 +00:00
Yo Chiang
95bd22edb6
Merge "Remove PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE from gsi_release.mk"
2021-01-20 03:27:03 +00:00
Treehugger Robot
864085f9df
Merge "Includes recovery resources into vendor_boot-debug.img" am: b45217bdc4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1554176
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I143b876bc736ee9ab63033481f83c132d7cca0dc
2021-01-20 02:39:51 +00:00
Inseob Kim
0b7f0c122d
Merge "Implement directed vendor snapshot" am: 890f84fe71
am: 5623e597cc
am: ddb4d966c2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1541904
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id1b0031ba9c8cb1b2f95160e01efb653e1bb3aa6
2021-01-20 02:16:15 +00:00
Ryan Prichard
adae9335d3
Merge "Switch platform EH unwinder to prebuilt LLVM libunwind" am: 39ac1faf76
am: fcb16db6c1
am: 00c871bee8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1551261
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie7c8af3850045c5f7eff57afbcc826813ed9f9b7
2021-01-20 02:15:55 +00:00
Treehugger Robot
b45217bdc4
Merge "Includes recovery resources into vendor_boot-debug.img"
2021-01-20 02:06:10 +00:00
Inseob Kim
ddb4d966c2
Merge "Implement directed vendor snapshot" am: 890f84fe71
am: 5623e597cc
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1541904
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id4a3ef7e00918ba1064bf3b92db6affc8dbe9c33
2021-01-20 02:01:44 +00:00
Inseob Kim
5623e597cc
Merge "Implement directed vendor snapshot" am: 890f84fe71
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1541904
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib700bd9a7c1c8278a3d183ac5d864f0a262008f6
2021-01-20 01:54:01 +00:00
Ryan Prichard
00c871bee8
Merge "Switch platform EH unwinder to prebuilt LLVM libunwind" am: 39ac1faf76
am: fcb16db6c1
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1551261
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3734ad3fee9c975e1793dfc8aee62649152b9209
2021-01-20 01:53:10 +00:00
Inseob Kim
890f84fe71
Merge "Implement directed vendor snapshot"
2021-01-20 01:17:23 +00:00
Ryan Prichard
fcb16db6c1
Merge "Switch platform EH unwinder to prebuilt LLVM libunwind" am: 39ac1faf76
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1551261
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia8632dda856f9c5d8fdf0fb84f894f86b88b9a65
2021-01-20 00:44:05 +00:00
Ryan Prichard
39ac1faf76
Merge "Switch platform EH unwinder to prebuilt LLVM libunwind"
2021-01-20 00:10:58 +00:00
Kelvin Zhang
239a79ae19
Emit virtual_ab_compression prop to dynamic_parttiion_info.txt
...
Test: mm -j && mm -j dist, make sure virtual_ab_compression is set to
true in dynamic_partition_info.txt of target_File.zip
Change-Id: Id0d46bd8ed738b2b69a0c01481b7db0c7127f773
2021-01-19 16:11:32 -05:00
Anton Hansson
9204e8a4c3
[automerged blank] Revert "[DO NOT MERGE] iorap: Turn off iorap for R before resolving the regression. am: b73d551613" 2p: caf47e29d1
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13369272
Change-Id: Iea45db99e8a2d863b2b5edb8d395e5922f42dbad
2021-01-19 20:19:18 +00:00
Anton Hansson
caf47e29d1
Revert "[DO NOT MERGE] iorap: Turn off iorap for R before resolving the regression. am: b73d551613"
...
This reverts commit a5a0ab7e6a
, reversing
changes made to c6bd47a429
.
- It was removed from aosp here: http://r.android.com/1440211
- Incorrect DO NOT MERGE here: go/ag/13194361
- Really strange auto-merge here: ag/13203448
Test: No
Change-Id: Ia412a74d430c0ee594c17b86cb451b36737cf310
2021-01-19 20:17:40 +00:00
Nicolas Geoffray
897fe0e8df
Split out minimal ART dexpreopt config and use it in mainline builds.
...
The config sets a few system properties that end up in command-line
arguments passed to dex2oat. Without these properties dex2oat invocation
fails, because options -Xms and -Xmx are do not have an argument.
Test: buid_mainline_modules.sh
Bug: 176171716
Change-Id: I4fd1f059aad5d48495948bfd668307de8b3d9ee1
2021-01-19 17:03:30 +00:00
Yo Chiang
68ab626aac
Specify --ramdisk_name for vendor ramdisks for vendor_boot v4
...
When building vendor_boot v4 with multiple vendor ramdisks, pass the
name of each ramdisk to mkbootimg.
Bug: 177882072
Test: Modify a device BoardConfig and verify the built vendor_boot.img
with unpack_bootimg
Change-Id: I679d277aa88f1e10678d2f74b579e4140536e267
2021-01-19 18:58:43 +08:00