Commit Graph

35929 Commits

Author SHA1 Message Date
Cole Faust
1b32c99148 Merge "Install LOCAL_SOONG_INSTALL_SYMLINKS even if LOCAL_SOONG_INSTALLED_MODULE isn't set" into main am: 56e8f7009c am: 62fcb3fcf5 am: 79b49a32ba am: 0273f3cd40 am: a4b5a72af6
Original change: https://android-review.googlesource.com/c/platform/build/+/2737051

Change-Id: I75b8e1667708066e8078c3d4eb3727b758ca87a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 04:11:12 +00:00
Cole Faust
79b49a32ba Merge "Install LOCAL_SOONG_INSTALL_SYMLINKS even if LOCAL_SOONG_INSTALLED_MODULE isn't set" into main am: 56e8f7009c am: 62fcb3fcf5
Original change: https://android-review.googlesource.com/c/platform/build/+/2737051

Change-Id: Icb542999a02db66ea698b95158ec0f2231141013
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 01:50:24 +00:00
Cole Faust
62fcb3fcf5 Merge "Install LOCAL_SOONG_INSTALL_SYMLINKS even if LOCAL_SOONG_INSTALLED_MODULE isn't set" into main am: 56e8f7009c
Original change: https://android-review.googlesource.com/c/platform/build/+/2737051

Change-Id: Iaa7f81c3a30efd028a29070dabe74d638b0cd748
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 01:00:51 +00:00
Cole Faust
56e8f7009c Merge "Install LOCAL_SOONG_INSTALL_SYMLINKS even if LOCAL_SOONG_INSTALLED_MODULE isn't set" into main 2023-09-06 00:15:09 +00:00
Cole Faust
c67e769b8c Install LOCAL_SOONG_INSTALL_SYMLINKS even if LOCAL_SOONG_INSTALLED_MODULE isn't set
LOCAL_SOONG_INSTALL_SYMLINKS can now be set by the install_symlink
module type. The install_symlink module type doesn't set
LOCAL_SOONG_INSTALLED_MODULE because make tries to copy that file
around, which doesn't work with a symlink.

Bug: 205632228
Test: built and ran the emulator observed the /system/bin/hwservicemanager symlink is still there
Change-Id: I1ec355b5ae057d0b7fe167674d70da6a4d03f6b5
2023-09-05 14:16:38 -07:00
Treehugger Robot
3fbd1e4f7f Merge "Reland: Add 16k/4k boot OTAs to /system partition" into main am: 4d779cf4cd am: 61291bb9a7 am: b4a808523d am: f39afc4ea9 am: 15a0ac9a6a
Original change: https://android-review.googlesource.com/c/platform/build/+/2737042

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

Change-Id: I61c125c9806658f33114dbcec89e9c499c6e00fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 19:44:20 +00:00
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
Xin Li
236f2cd5e3 Merge "Merge UP1A.230905.019" into aosp-main-future 2023-09-05 18:36:11 +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
Jordan Demeulenaere
f3f27c5936 Enable Compose in SystemUI
Bug: 238993727
Bug: 242040009
Test: Manual. See http://go/sysui-compose-performance-results for
details on performance analysis.
Test: Platinium tests passed on Forrest. See
 http://go/abtd-run/L56600000962427117
Ignore-AOSP-First: We need to submit this together with a bunch of other
 SystemUI CLs.

Change-Id: I62efad92bd1940db3524214eac2deef6d356c235
2023-09-05 10:07:33 +02:00
Kiyoung Kim
243dfd4c9c Merge "Do not set ro.(product.)vndk.version if VNDK is deprecated" into main am: a28e56e1cc am: e68edc80c1 am: 000b71f387 am: b5ad8b1e3f am: 00add245be
Original change: https://android-review.googlesource.com/c/platform/build/+/2727594

Change-Id: If1b99edca70319d79c510c26082e8018c8160e03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-04 12:26:01 +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
My Name
d19955c7b7 Bump SDK Extension version to 10 am: e30a739758
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24621554

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

Change-Id: I23f7bfea019bc2b2c566d41c402f3225d86c5f38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 23:10:44 +00:00
Nikita Ioffe
7efd48e008 Merge "Propagate RELEASE_AVF_ENABLE_MULTI_TENANT_MICRODROID_VM to soong" into main am: 68e7cb9c67 am: c8a6acbce8 am: ec81ed24b6 am: 279301b11c am: a882c21d19
Original change: https://android-review.googlesource.com/c/platform/build/+/2735632

Change-Id: I04aef7332df9b531c04974bf7c378fb8a6931605
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 23:09:58 +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
Treehugger Robot
52cf201d00 Merge "Add missing depdency for 16k boot image" into main am: 333d29dbb8 am: 6a69f07936 am: 4bfa750964 am: ffed1730a7 am: a018b2e260
Original change: https://android-review.googlesource.com/c/platform/build/+/2734625

Change-Id: I34495280006cd738005981a1faef453dbce1f560
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 18:57:55 +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
0a6c4937b6 Merge "Remove code about mixed sepolicy build" into main am: 3c7a42328c am: 387befd639 am: 98768c7ec7 am: 5a8ba40a11 am: a0e6252b41
Original change: https://android-review.googlesource.com/c/platform/build/+/2734338

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

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

Change-Id: Ia24ed03b53a2c257f900ca60e9fb470b7a186231
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 00:53:33 +00:00
Kelvin Zhang
0139035d67 Merge "Resize boot_16k.img properly" into main am: a87ce9086f am: 857824f7cd am: 4a17d7b479 am: 7cb7de3b2f am: 29fc685432
Original change: https://android-review.googlesource.com/c/platform/build/+/2733818

Change-Id: Ia35a49bea7b517b7ef4cc1097da9dbd2eb97b904
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 00:49:18 +00:00
Romain Jobredeaux
64e3833373 Merge "Expose global proguard flags for use by R8." into main am: 1fb1dd2fb1 am: e13b1092c6 am: de8fe1b2cd am: ec2de374af am: bd9763a44d
Original change: https://android-review.googlesource.com/c/platform/build/+/2733475

Change-Id: I0424b1e53366f59fa20b98593ad7fd001c9a775f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 00:45:17 +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