Treehugger Robot
6a69f07936
Merge "Add missing depdency for 16k boot image" into main am: 333d29dbb8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2734625
Change-Id: I8b571c31548626dac3ca647cb12331c7dc266d57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-01 15:39:06 +00:00
Treehugger Robot
333d29dbb8
Merge "Add missing depdency for 16k boot image" into main
2023-09-01 14:49:32 +00:00
Nikita Ioffe
53d1acaf11
Propagate RELEASE_AVF_ENABLE_MULTI_TENANT_MICRODROID_VM to soong
...
Bug: 298008232
Test: builds
Change-Id: I1ec0b2cefdac862d3704968046076b59664c2b5d
2023-09-01 13:56:13 +01:00
Inseob Kim
387befd639
Merge "Remove code about mixed sepolicy build" into main am: 3c7a42328c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2734338
Change-Id: Ib7f7344c4b493afe0e70603f069a20b04cd4c90e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-01 01:33:44 +00:00
Pawan Wagh
3ce34e4c5f
Merge "Adding a system property to enable 16k dev options" into main am: 904c8194dd
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2729459
Change-Id: I59781064b7861fc02b5234012a7e82f7d5d978d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-01 01:32:56 +00:00
Inseob Kim
3c7a42328c
Merge "Remove code about mixed sepolicy build" into main
2023-09-01 01:06:38 +00:00
Pawan Wagh
904c8194dd
Merge "Adding a system property to enable 16k dev options" into main
2023-09-01 00:26:13 +00:00
Kelvin Zhang
542a27eecf
Add missing depdency for 16k boot image
...
Bug: 298295675
Bug: 293313353
Test: th
Change-Id: I9679c151e77398e161c04487699bc3a0d776ab13
2023-08-31 16:25:12 -07:00
Treehugger Robot
d894889dc9
Merge "Build the proguard dict zip without PACKAGING intermediates" into main am: bf5f9bf015
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2734167
Change-Id: I17244b1f9de61e1128ded4864fbefd2884e95b4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 20:23:46 +00:00
Kelvin Zhang
857824f7cd
Merge "Resize boot_16k.img properly" into main am: a87ce9086f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2733818
Change-Id: I789e3839dd6c53c20d9739fd4dc97a97e7027651
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 20:22:25 +00:00
Romain Jobredeaux
e13b1092c6
Merge "Expose global proguard flags for use by R8." into main am: 1fb1dd2fb1
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2733475
Change-Id: I8bbe01de4070b1008e153e57e365867271b890f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 20:20:20 +00:00
Pawan Wagh
8253e12483
Adding a system property to enable 16k dev options
...
16K dev option should be visible on particular devices which set
PRODUCT_16K_DEVELOPER_OPTION. Adding a system property which will be
enabled based on this option.
Test: m, booted device with PRODUCT_16K_DEVELOPER_OPTION ON/OFF and
verified option visibility.
Bug: 297922563
Change-Id: I6d1cd2ce0c6f38fb43222d8e1ac2b797ef675c62
2023-08-31 20:08:31 +00:00
Treehugger Robot
bf5f9bf015
Merge "Build the proguard dict zip without PACKAGING intermediates" into main
2023-08-31 19:37:27 +00:00
Kelvin Zhang
a87ce9086f
Merge "Resize boot_16k.img properly" into main
2023-08-31 19:17:34 +00:00
Kelvin Zhang
8aa6525ad7
Use seek() instead of writing 0s
...
test_ZipWrite_large_file need to write a 4GB file to zipfile for
testing. Instead of writing sequence of 0s to the test file, use seek().
Test: th
Bug: 298138109
Change-Id: I886bfa0c3f21664e529ba7de9688909518148f61
2023-08-31 12:17:14 -07:00
Kelvin Zhang
c4f737406a
Mark boot OTAs as partial OTAs
...
Boot partition only OTA must be marked as "partial". This is required
for update_engine to correctly copy non-updated partitions to the target
slot.
Test: th
Bug: 293313353
Change-Id: Ic89d03f214e12fa43f686d37854d6fed1d78a6a3
2023-08-31 12:17:14 -07:00
Kelvin Zhang
bf2d400799
Resize boot_16k.img properly
...
Bootloaders often assume boot partition to be 64MB in size. Correctly
size boot_16k.img so that bootloader can verify the AVB footers.
Test: th
Bug: 293313353
Change-Id: I322277b10e99a41c9a262ff76e2f29c3ed16fec0
2023-08-31 12:17:14 -07:00
Xin Li
3a846b926f
Merge UP1A.230905.019
...
Merged-In: Ia5208702fc02d0e1ab53d1affc664363fba74a67
Change-Id: I7ba769565b1dbf56d6e00d85c87b7235b14a857a
2023-08-31 12:08:31 -07:00
Romain Jobredeaux
1fb1dd2fb1
Merge "Expose global proguard flags for use by R8." into main
2023-08-31 18:54:49 +00:00
Devin Moore
22eb386535
Merge changes from topic "no_hidl_support" into main am: 01e56d0ae0
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2650297
Change-Id: I80fee5153e6ae4bdfb666faf2afc45f2e94372bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 16:22:50 +00:00
Devin Moore
278aea5ba4
Remove hwservicemanager and hidl allocator. am: 64c2559577
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2650296
Change-Id: I250e776c31413097c7c5438db36be890bcdd0881
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 16:22:41 +00:00
Devin Moore
01e56d0ae0
Merge changes from topic "no_hidl_support" into main
...
* changes:
Add symlink to hwservicemanager
Remove hwservicemanager and hidl allocator.
2023-08-31 15:51:14 +00:00
Treehugger Robot
69c8926522
Merge "Avoid calling MergeUpdateEngineConfig for non-ab target" into main am: c20ef7ca4a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2653761
Change-Id: I12468fb66e3c0915cbd92723c9206950b9721393
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 15:31:37 +00:00
Treehugger Robot
c20ef7ca4a
Merge "Avoid calling MergeUpdateEngineConfig for non-ab target" into main
2023-08-31 14:30:17 +00:00
Inseob Kim
c36ff859e9
Remove code about mixed sepolicy build
...
There is no one actively using mixed sepolicy build, and it made
sepolicy codes too complicated. As we are deprecating mixed build,
removing such code for cleanup.
Bug: 298305798
Test: boot cuttlefish
Change-Id: I6efcfd7bde398564f909b41b3e156ac3d98d64d6
2023-08-31 16:52:04 +09:00
Ken Chen
4f6a32d86f
Merge "Revert "Add 16k/4k boot OTAs to /system partition"" into main am: 7a6468edd5
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2734334
Change-Id: I27fc3fe1df0c32b433d8d347330acd3cf1551836
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 03:22:46 +00:00
Ken Chen
7a6468edd5
Merge "Revert "Add 16k/4k boot OTAs to /system partition"" into main
2023-08-31 02:57:25 +00:00
Ken Chen
2610f34671
Revert "Add 16k/4k boot OTAs to /system partition"
...
This reverts commit a2674525ae
.
Reason for revert: Investigate b/298295675
Change-Id: Ia44137695d6e9a1b99f4cc6e4dcc88bd3b4156db
2023-08-31 02:38:02 +00:00
Cole Faust
b35231ece0
Build the proguard dict zip without PACKAGING intermediates
...
Before, as each module was built, it would dump its proguard-related
files into the PACKAGING folder. Then the rule for the final distable
zip would zip up this whole folder. This means that if you built a
module that was not part of the system, and then rebuilt the final
zip, it would erronously include more proguard files than necessary.
This problem was worked around by relying on CI to run `m installclean`
every time.
Now, the zip proguard files always include the same information.
This also makes it so that when you build a module, its proguard files
are not copied to the PACKAGING folder, making builds that don't
build the final proguard zips slightly faster.
Bug: 205632228
Test: diff'd proguard-dict.zip, proguard-dict-mapping.textproto, and proguard-usage.zip before/after this cl on sdk_phone_x86_64. They have diffs, but only in the order of files / lines.
Change-Id: I98c02e1eb117c337ba9b98f04ad486597eb9bb86
2023-08-30 17:17:19 -07:00
Kelvin Zhang
9e02776e5c
Merge "Add 16k/4k boot OTAs to /system partition" into main am: ee8b6cf22d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2734615
Change-Id: I8e2113ae0c1ccb488171fbd3dc0d87cdc78ea548
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 00:10:34 +00:00
Kelvin Zhang
ee8b6cf22d
Merge "Add 16k/4k boot OTAs to /system partition" into main
2023-08-30 23:30:01 +00:00
Treehugger Robot
0a60fcee26
Merge "make fake_device_config buildable on host" into main am: f153237a03
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2734157
Change-Id: I2f847e86600ad023f02697c3e5459c86de7c610b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-30 20:11:53 +00:00
Kelvin Zhang
a2674525ae
Add 16k/4k boot OTAs to /system partition
...
This allows switching kernels without downloading anything from
internet.
Test: th
Bug: 293313353
Change-Id: I29e48dc191091930a7d0a690924b37c572fa9356
2023-08-30 13:06:17 -07:00
Treehugger Robot
f153237a03
Merge "make fake_device_config buildable on host" into main
2023-08-30 19:44:39 +00:00
Joe Onorato
cede86dd28
make fake_device_config buildable on host
...
Test: treehugger
Bug: 277916185
Change-Id: I002669bbb605b7968b81c66d1cbf0ff3caa0c699
Merged-In: I002669bbb605b7968b81c66d1cbf0ff3caa0c699
2023-08-30 11:39:29 -07:00
Romain Jobredeaux
bec914598f
Expose global proguard flags for use by R8.
...
Bug: 293304784
Test: CI
Change-Id: I0e30f3e1affc2493cb63cb94266ad0a6b636ebc8
2023-08-30 11:48:52 -04:00
Treehugger Robot
f45586061b
Merge "Add timestamp to 16K boot OTA" into main am: 132be7e516
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2726999
Change-Id: I2286092b17ee5290db318b1726dfc28b6250197e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-30 04:49:01 +00:00
Treehugger Robot
132be7e516
Merge "Add timestamp to 16K boot OTA" into main
2023-08-30 04:11:29 +00:00
Treehugger Robot
9aa1182af0
Merge "Sign the 16K boot image OTA" into main am: 7090051129
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2726997
Change-Id: Iacfba38bbfad9cdd644dc4e555f31100ce4f2451
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-30 04:01:16 +00:00
Treehugger Robot
7090051129
Merge "Sign the 16K boot image OTA" into main
2023-08-30 03:26:41 +00:00
Kelvin Zhang
506a30851e
Add timestamp to 16K boot OTA
...
Test: th
Bug: 297536338
Change-Id: Id4919d2437079e36899cd4c56da011a29aa0b470
2023-08-29 19:38:19 -07:00
Kelvin Zhang
ed60c9da27
Sign the 16K boot image OTA
...
Sign the 16K OTA package so that it can be installed by device.
Test: th
Bug: 293313353
Change-Id: I2f1f6f5430fc920d5edeeab3f3335cbdf76fdefd
2023-08-29 19:18:49 -07:00
Jerry Jia
dac2660623
Merge "Add libaconfig_python_proto target for Mobly host-based tests" into main am: e40f2800af
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2726480
Change-Id: Ib5049d49260af3763aa77ace9117924655afc3ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-29 23:13:15 +00:00
Cole Faust
9ff7a37096
Don't read the odex zip files when building sbom-metadata.csv
...
The files inside the odex zip files are now part of $(installed_files)
as of aosp/2729625.
Bug: 205632228
Test: m out/target/product/emulator_x86_64/sbom-metadata.csv, before this cl you can find duplicate entries for the odex files. After this cl there's only 1
Change-Id: I1645bd1bb9e1f10fc3746225a15b8431b666580e
2023-08-29 15:39:10 -07:00
Jerry Jia
e40f2800af
Merge "Add libaconfig_python_proto target for Mobly host-based tests" into main
2023-08-29 22:33:32 +00:00
Zhi Dou
f1b494624c
Merge "aconfig: generate full fakefeatureflagsimpl in prod mode" into main am: 401be560de
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2709686
Change-Id: I93519fc9229e061278ffbbc18d0458dbaabad808
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-29 14:23:36 +00:00
Zhi Dou
401be560de
Merge "aconfig: generate full fakefeatureflagsimpl in prod mode" into main
2023-08-29 13:29:31 +00:00
Cole Faust
377f554483
Merge "Add dexpreopt files to ALL_MODULES.$(m).INSTALLED" into main am: 303d7da643
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2729625
Change-Id: I60ad04622bfd6fde210957916634b749f1f914c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-29 03:29:49 +00:00
Treehugger Robot
6ca8e44d67
Merge "ota_from_target_files requires apexd_host" into main am: 4b00773378
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2730213
Change-Id: I256a556121da78c37923510786e34a5bef5049c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-29 03:28:47 +00:00
Cole Faust
303d7da643
Merge "Add dexpreopt files to ALL_MODULES.$(m).INSTALLED" into main
2023-08-29 02:46:09 +00:00