Commit Graph

89516 Commits

Author SHA1 Message Date
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
Treehugger Robot
4b00773378 Merge "ota_from_target_files requires apexd_host" into main 2023-08-29 02:24:11 +00:00
Treehugger Robot
d6e3f50ed0 Merge "Use board api level for seapp coredomain check" into main am: c8c6cbbb27
Original change: https://android-review.googlesource.com/c/platform/build/+/2727597

Change-Id: Ib240dec2e031f1e5f6ba650c7a9dada63282fad4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 01:56:09 +00:00
Jooyung Han
ccec6ad2ec ota_from_target_files requires apexd_host
apexd_host is invoked in check_target_files_vintf.py
to prepare the apex directory before invoking checkvintf. ota_from_target_files uses check_target_files_vintf.py via (python_library) releasetools_check_target_files_vintf.

Since soong doesn't inherit "required:" property from library to binary, adding the dependency manually to ota_from_target_files.

Bug: n/a
Test: $ m ota_from_target_files # should build apexd_host
Change-Id: Ie7e6c3acf376c23960f242294f5a9bf99fec26aa
2023-08-29 01:28:40 +00:00
Cole Faust
a220e4596f Add dexpreopt files to ALL_MODULES.$(m).INSTALLED
We're trying to make FULL_SYSTEMIMAGE_DEPS more accurate to remove the
need for `m installclean`. The dexpreopt files did not show up in
FULL_SYSTEMIMAGE_DEPS, because they were installed with a custom
post-install command.

The dexpreopt implementation is shared between soong/make, which means
a lot of it happens at execution time for make. However, we have enough
information to guess what files to install will be inside the zip file.

Add an execution-time check that our guess is correct, and then add
the guessed files to `ALL_MODULES.$(m).INSTALLED`.

This also allows us to remove the post-install command, and just
generate rules to install the files we want directly.

Bug: 205632228
Test: full build on an internal product that uses dex-preopted make modules
Change-Id: I57db58e4587e3e198ec650c6fb39a908e4ec6993
2023-08-28 18:12:30 -07:00
Treehugger Robot
c8c6cbbb27 Merge "Use board api level for seapp coredomain check" into main 2023-08-29 01:09:37 +00:00
Xin Li
c76319f88c Merge "Merge Android U (ab/10368041)" into aosp-main-future 2023-08-28 22:13:35 +00:00
Zhi Dou
06a448fac7 aconfig: generate full fakefeatureflagsimpl in prod mode
This change will generate full fakefeatureflagsimpl in prod mode.
FakeFeatureFlagsImp will be the same in test mode and the prod mode.
FeatureFlagsImpl will be all unimplemented in test mode. setFlag,
resetAll are added into the interface FeatureFlags.

The reason to make this change is for project using injection pattern,
the project doesn't have to use test mode to test the flag guarded code.
The project can directly use the FakeFeatureFlagsImpl for testing.

Bug: 294838180
Test: atest AconfigJavaHostTest --host AND atest aconfig.test.java
Change-Id: Ib6d40fd3a9ef872e01594fd4f8d6c4cb10bb173a
2023-08-28 16:54:15 +00:00
Inseob Kim
3c7b91bac1 Use board api level for seapp coredomain check
Rather than PRODUCT_SHIPPING_API_LEVEL, use board api level
(BOARD_API_LEVEL or BOARD_SHIPPING_API_LEVEL) to determine whether we
check coredomain violations or not.

Also provides a Makefile variable to override the flag, for targets that
want to turn on the check optionally.

Bug: 280547417
Test: see build command of vendor_seapp_contexts
Change-Id: I177630d33313334ca4a56a9be88b78cff678281e
2023-08-28 07:33:12 +00:00
Jooyung Han
db3c1b173f Merge "Remove TARGET_FLATTEN_APEX" into main am: 5d7f9cb2a1
Original change: https://android-review.googlesource.com/c/platform/build/+/2727593

Change-Id: Ide054683665fe88e04f46f607b7408f1b7ccda01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 01:03:27 +00:00
Jooyung Han
5d7f9cb2a1 Merge "Remove TARGET_FLATTEN_APEX" into main 2023-08-28 00:32:35 +00:00
Treehugger Robot
a1c288f36a Merge "Reduce OTA tools's dependency on brillo_update_payload" into main am: fb4fb4b766
Original change: https://android-review.googlesource.com/c/platform/build/+/2726801

Change-Id: I589cfce6f21ba1bcd0c7c5566f336f85719d91b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-26 00:40:44 +00:00
Treehugger Robot
fb4fb4b766 Merge "Reduce OTA tools's dependency on brillo_update_payload" into main 2023-08-26 00:22:57 +00:00
Kelvin Zhang
f6fe0a9c9c Reduce OTA tools's dependency on brillo_update_payload
brillo_update_payload is thin bash wrapper for delta_generator, and
OTA tools are wrappers around brillo_update_payload. This is
inconveinent, as adding a new flag requires changing 3 places. Since
brillo_update_payload is really thin, skip it and invoke delta_generator
directly.

Test: th
Bug: 293313353
Change-Id: I2fd5af95c571ea45aea62f9eec475f0f4e864953
2023-08-25 13:49:09 -07:00
Xin Li
be1435290d Merge Android U (ab/10368041)
Bug: 291102124
Merged-In: If9360ebd0acebe85f42f89a268c316d51c765708
Change-Id: I58470464a3239a2ad8e82e4821bb27a2892a8302
2023-08-25 13:25:26 -07:00
Treehugger Robot
d3cfff21f4 Merge "Fix 16k ota package build failures on pixel" into main am: 8c3bb5b993
Original change: https://android-review.googlesource.com/c/platform/build/+/2726994

Change-Id: I57108c8b3aabfd4be81b4b986db6abd86e160ef3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 19:47:18 +00:00
Treehugger Robot
8c3bb5b993 Merge "Fix 16k ota package build failures on pixel" into main 2023-08-25 18:50:34 +00:00
Treehugger Robot
2a6a71476b Merge "Use platform built lz4 tool rather than system copy" into main am: 510e0f2cbd
Original change: https://android-review.googlesource.com/c/platform/build/+/2724254

Change-Id: Ifbb87b7a8740f076075ea3aa1b05fab5326015f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 18:22:51 +00:00
Treehugger Robot
510e0f2cbd Merge "Use platform built lz4 tool rather than system copy" into main 2023-08-25 17:48:13 +00:00
Kelvin Zhang
e9f4ce4368 Fix 16k ota package build failures on pixel
boot_ota_16k.zip relies on build_boot_from_kernel_avb_enabled. But that
makefile function is guarded by $(BOARD_PREBUILT_BOOTIMAGE). Pixel
defined BOARD_PREBUILT_BOOTIMAGE, which causes
build_boot_from_kernel_avb_enabled to be undefined, resulting in build
failure.

Test: th
Bug: 293313353
Change-Id: I5b01e9bf7fedd9c508f476bc243d860dc48c5ebb
2023-08-25 10:41:48 -07:00
Zhi Dou
68bf49c7c3 Merge "aconfig: add fixed read only flag" into main am: feac202f19
Original change: https://android-review.googlesource.com/c/platform/build/+/2720613

Change-Id: I1acf2c13e2684f5ba2d5b36dba94c8e7c9d46da9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 14:15:31 +00:00
Zhi Dou
feac202f19 Merge "aconfig: add fixed read only flag" into main 2023-08-25 13:37:37 +00:00
Jooyung Han
0d500c58aa Remove TARGET_FLATTEN_APEX
And inherit updatable_apex.mk by default.

Bug: 278826656
Test: presubmit
Change-Id: I3f93608a8750dcd72edc3f9517c70f3490f1a7cd
2023-08-25 15:06:20 +09:00
Kiyoung Kim
3747299783 Do not set ro.(product.)vndk.version if VNDK is deprecated
ro.(product.)vndk.version should be empty when the VNDK is deprecated.
This change skips property set up when KEEP_VNDK flag is false. Device
can check if VNDK is deprecated with ro.(product.)vndk.version property.

Bug: 290159430
Test: aosp_cf_x86_64_phone build and boot succeeded.
Change-Id: Ia02fb33137c8df456fda87b5b769cfb940349747
2023-08-25 14:05:06 +09:00
Treehugger Robot
695570c064 Merge "Skip building compat files if REL" into main am: b531ccf36e
Original change: https://android-review.googlesource.com/c/platform/build/+/2724973

Change-Id: I60db50f0f2bb3a09db3793447f5c08ce186df784
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 04:45:29 +00:00