Commit Graph

34799 Commits

Author SHA1 Message Date
Treehugger Robot
b4a808523d Merge "Reland: Add 16k/4k boot OTAs to /system partition" into main am: 4d779cf4cd am: 61291bb9a7
Original change: https://android-review.googlesource.com/c/platform/build/+/2737042

Change-Id: Ie67f3eed1c5b04194c9ea1ee30bb43ee89d220f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 19:20:27 +00:00
Treehugger Robot
61291bb9a7 Merge "Reland: Add 16k/4k boot OTAs to /system partition" into main am: 4d779cf4cd
Original change: https://android-review.googlesource.com/c/platform/build/+/2737042

Change-Id: If10df8b82643b13ebae55415b3281b20e92f59d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 18:12:08 +00:00
Jared Duke
ae9d49b5ad Merge "Ensure special Dalvik annotations are kept" into main am: 2674152fdc am: 2e2c2ab1b8
Original change: https://android-review.googlesource.com/c/platform/build/+/2737913

Change-Id: I1db8277132485f3457c9a753f89f929437956bba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 17:00:49 +00:00
Treehugger Robot
4d779cf4cd Merge "Reland: Add 16k/4k boot OTAs to /system partition" into main 2023-09-05 16:55:20 +00:00
Jared Duke
2e2c2ab1b8 Merge "Ensure special Dalvik annotations are kept" into main am: 2674152fdc
Original change: https://android-review.googlesource.com/c/platform/build/+/2737913

Change-Id: I17e8b34094ac694729a58ef4f29333df1cc71cce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 16:10:48 +00:00
Jared Duke
2674152fdc Merge "Ensure special Dalvik annotations are kept" into main 2023-09-05 15:49:17 +00:00
Kiyoung Kim
000b71f387 Merge "Do not set ro.(product.)vndk.version if VNDK is deprecated" into main am: a28e56e1cc am: e68edc80c1
Original change: https://android-review.googlesource.com/c/platform/build/+/2727594

Change-Id: Ic95343e8b504c26bd899089ced7f63526f264f36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-04 09:55:18 +00:00
Kiyoung Kim
e68edc80c1 Merge "Do not set ro.(product.)vndk.version if VNDK is deprecated" into main am: a28e56e1cc
Original change: https://android-review.googlesource.com/c/platform/build/+/2727594

Change-Id: I3968b8e6773bb60cb8ef064af931536177eaa019
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-04 09:00:11 +00:00
Kiyoung Kim
a28e56e1cc Merge "Do not set ro.(product.)vndk.version if VNDK is deprecated" into main 2023-09-04 08:09:56 +00:00
Jared Duke
cb3505c1be Ensure special Dalvik annotations are kept
These optimization annotations are special in that we don't want them
to have RUNTIME retention, but we do want them to be visible to ART.
R8 already has special rules to handle them, but with R8 full mode
it still requires a minimal keep rule for the given reference.

This allows usage of annotations like @NeverCompile from fully optimized
platform targets like SystemUI.

Bug: 215417388
Test: m + compare SystemUIGoogle.odex w/ @NeverCompile annotations
Change-Id: Id14bcc7b6d0d6dd385c60cfbe4d31f295cbaa5dc
2023-09-01 21:27:30 +00:00
Treehugger Robot
037ed034a4 Merge "Don't read the odex zip files when building sbom-metadata.csv" into main am: db21a2aee5 am: 5f0bd8a83f
Original change: https://android-review.googlesource.com/c/platform/build/+/2731043

Change-Id: I6bc74e5b4ca003e1ac38e671fb75a9be9099ed0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 20:42:48 +00:00
Nikita Ioffe
ec81ed24b6 Merge "Propagate RELEASE_AVF_ENABLE_MULTI_TENANT_MICRODROID_VM to soong" into main am: 68e7cb9c67 am: c8a6acbce8
Original change: https://android-review.googlesource.com/c/platform/build/+/2735632

Change-Id: Iaa520a9ded1feb8ba47298c6314d6fb80b385545
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 20:42:02 +00:00
Treehugger Robot
5f0bd8a83f Merge "Don't read the odex zip files when building sbom-metadata.csv" into main am: db21a2aee5
Original change: https://android-review.googlesource.com/c/platform/build/+/2731043

Change-Id: I3540341c1534781b8e224c11370bade90768055f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 19:48:20 +00:00
Nikita Ioffe
c8a6acbce8 Merge "Propagate RELEASE_AVF_ENABLE_MULTI_TENANT_MICRODROID_VM to soong" into main am: 68e7cb9c67
Original change: https://android-review.googlesource.com/c/platform/build/+/2735632

Change-Id: I6784feb23a37909bd74caf5563cf4067f2ffb9ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 19:47:55 +00:00
Treehugger Robot
db21a2aee5 Merge "Don't read the odex zip files when building sbom-metadata.csv" into main 2023-09-01 19:29:31 +00:00
Nikita Ioffe
68e7cb9c67 Merge "Propagate RELEASE_AVF_ENABLE_MULTI_TENANT_MICRODROID_VM to soong" into main 2023-09-01 18:44:17 +00:00
Kelvin Zhang
1738012f6d Reland: Add 16k/4k boot OTAs to /system partition
This allows switching kernels without downloading anything from
internet.

Test: th
Bug: 293313353

This reverts commit 2610f34671.

Change-Id: Iec6c9f9404ac1bb3286613c33d79b00b20c4c8bb
2023-09-01 17:04:43 +00:00
Treehugger Robot
4bfa750964 Merge "Add missing depdency for 16k boot image" into main am: 333d29dbb8 am: 6a69f07936
Original change: https://android-review.googlesource.com/c/platform/build/+/2734625

Change-Id: I305787a159c2dd860ba0f11d21ec94b1c03e7a63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 16:33:17 +00:00
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
98768c7ec7 Merge "Remove code about mixed sepolicy build" into main am: 3c7a42328c am: 387befd639
Original change: https://android-review.googlesource.com/c/platform/build/+/2734338

Change-Id: I4861d27d285728b0d98573cade8e7a40aaed40fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 02:27:26 +00:00
Pawan Wagh
a28b482ebe Merge "Adding a system property to enable 16k dev options" into main am: 904c8194dd am: 3ce34e4c5f
Original change: https://android-review.googlesource.com/c/platform/build/+/2729459

Change-Id: I6b428373e7859a0f2627b4e0d0292a0b093b7deb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 02:27:03 +00: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
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
0cdabb6101 Merge "Build the proguard dict zip without PACKAGING intermediates" into main am: bf5f9bf015 am: d894889dc9
Original change: https://android-review.googlesource.com/c/platform/build/+/2734167

Change-Id: Ib6a286f79c116cd16d01fee3499ce6dbe5e3fd4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31 21:32:23 +00:00
Kelvin Zhang
4a17d7b479 Merge "Resize boot_16k.img properly" into main am: a87ce9086f am: 857824f7cd
Original change: https://android-review.googlesource.com/c/platform/build/+/2733818

Change-Id: I9990b58b3e08b8279d1151e21ae95abf5c6d8fde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31 21:31:25 +00:00
Romain Jobredeaux
de8fe1b2cd Merge "Expose global proguard flags for use by R8." into main am: 1fb1dd2fb1 am: e13b1092c6
Original change: https://android-review.googlesource.com/c/platform/build/+/2733475

Change-Id: Icc05e880bdc420647a4ab841d4dfc7bb714da078
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31 21:28:32 +00: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
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
Romain Jobredeaux
1fb1dd2fb1 Merge "Expose global proguard flags for use by R8." into main 2023-08-31 18:54:49 +00:00
Devin Moore
7912e703ad Merge changes from topic "no_hidl_support" into main am: 01e56d0ae0 am: 22eb386535
Original change: https://android-review.googlesource.com/c/platform/build/+/2650297

Change-Id: Ieccef169691f280cb5e67ed8d45a75378e0dbaa8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31 16:25:14 +00:00
Devin Moore
516f2d9cb8 Remove hwservicemanager and hidl allocator. am: 64c2559577 am: 278aea5ba4
Original change: https://android-review.googlesource.com/c/platform/build/+/2650296

Change-Id: I2a62fa5d2bc5286c5022d062f5bedf6ffdece410
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31 16:25:08 +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
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
62c7a824a9 Merge "Revert "Add 16k/4k boot OTAs to /system partition"" into main am: 7a6468edd5 am: 4f6a32d86f
Original change: https://android-review.googlesource.com/c/platform/build/+/2734334

Change-Id: Ic2bd5bf73c9cc00a294305bb976f5990655d8b02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31 04:14:06 +00: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
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
Kelvin Zhang
1fadfdf0aa Merge "Add 16k/4k boot OTAs to /system partition" into main am: ee8b6cf22d am: 9e02776e5c
Original change: https://android-review.googlesource.com/c/platform/build/+/2734615

Change-Id: Icb65bac269c97397a29aa37a191bdaf034916ba6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31 01:03:57 +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