Commit Graph

29402 Commits

Author SHA1 Message Date
Spandan Das
0d3e1277c6 Merge "Move manifest generation logic into static_java_library.mk" am: 13daf3d4a2 am: 362bf03c3b
Original change: https://android-review.googlesource.com/c/platform/build/+/1835800

Change-Id: Ie3d1f00336f86542103bda4b33d9b9d03e9e3927
2022-01-06 23:00:13 +00:00
Spandan Das
13daf3d4a2 Merge "Move manifest generation logic into static_java_library.mk" 2022-01-06 22:21:03 +00:00
Yi-Yo Chiang
9b2584170e Unconditionally copy the system build.prop into target_files archive
releasetools preconditions requires build metadata defined in
SYSTEM/build.prop even when building a system.img-less product.
Copy the SYSTEM/build.prop into the build artifact archive whenever
possible to make add_img_to_target_files happy.

Bug: 212486689
Bug: 213028932
Test: Dist build a system.img-less product. Product properties are
  read from SYSTEM/build.prop and no build error occurred.
Change-Id: I2ce7f8b8ae981eaf06e2d8d2485b55b4e975caa9
2022-01-07 03:29:14 +08:00
Spandan Das
68684bea79 Move manifest generation logic into static_java_library.mk
Previously a manifest file would be generated for static_java_library.mk
and package_internal.mk. For pacakge_internal.mk, this would cause
cryptic errors like b/188612215#2

With this CL, a manifest file would only be generated for java_library
with need_compile_res == true. The advantages are
1. No redundant generation for java_library with need_compile_res == false
(i.e. modules that do not require aapt2)
2. Force devs to provide manifest for android_app, and not silently
generating one for them

Bug: 188652897
Test: TH
Test: m nothing in tv-dev, car-dev

Change-Id: I69a23e373f1b4ac1569ae5b1d36067bfc0dadc05
2022-01-06 18:47:57 +00:00
Treehugger Robot
2a9e4e85c6 Merge "Fix build error on empty root folder" am: e33e7e518c am: 7e2a59a139 am: 49aceda26d am: 2d8e1811af
Original change: https://android-review.googlesource.com/c/platform/build/+/1934213

Change-Id: If3251ca8d42b315eb68a8b5b915f26cb0de86913
2022-01-06 15:09:38 +00:00
Treehugger Robot
2d8e1811af Merge "Fix build error on empty root folder" am: e33e7e518c am: 7e2a59a139 am: 49aceda26d
Original change: https://android-review.googlesource.com/c/platform/build/+/1934213

Change-Id: Ic6ce9af00e01b48e9a381282822ddf608f72b59f
2022-01-06 14:52:06 +00:00
Treehugger Robot
49aceda26d Merge "Fix build error on empty root folder" am: e33e7e518c am: 7e2a59a139
Original change: https://android-review.googlesource.com/c/platform/build/+/1934213

Change-Id: Iff59cf36aba9c8db81765df61e40724b762dedaf
2022-01-06 14:38:40 +00:00
Treehugger Robot
e33e7e518c Merge "Fix build error on empty root folder" 2022-01-06 13:54:27 +00:00
Jacky Liu
0e3352a241 Merge "Add PRODUCT_EXTRA_OTA_KEYS to add extra ota keys in otacerts.zip" am: bff997fd1f am: 4f9eb6b9e4 am: 429e1f339b am: 5f1bdb32ae
Original change: https://android-review.googlesource.com/c/platform/build/+/1934214

Change-Id: Ic9e4bdd75e95d6df1595e1371977a532ae830db3
2022-01-06 07:37:19 +00:00
Jacky Liu
5f1bdb32ae Merge "Add PRODUCT_EXTRA_OTA_KEYS to add extra ota keys in otacerts.zip" am: bff997fd1f am: 4f9eb6b9e4 am: 429e1f339b
Original change: https://android-review.googlesource.com/c/platform/build/+/1934214

Change-Id: I79f822306e48c9de2dc76d5f6edd6f27041369d1
2022-01-06 07:17:43 +00:00
Jacky Liu
429e1f339b Merge "Add PRODUCT_EXTRA_OTA_KEYS to add extra ota keys in otacerts.zip" am: bff997fd1f am: 4f9eb6b9e4
Original change: https://android-review.googlesource.com/c/platform/build/+/1934214

Change-Id: I1c164c7697ae10012f540677ce2423fe014e5e18
2022-01-06 06:58:05 +00:00
Yi-Yo Chiang
b225d8c499 Verbose warning message for PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT
I56ed328a9ae70cf49dbd3c6efb5a4a8c54e1b7a7 added a validation check to
otatools to check the target_files archive for the existence of
userdebug_plat_sepolicy.cil. That check superseded the original
PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT product_config.mk check and
is more robust because it can handle not only phone GSI but also car/tv
GSI (downstream of phone GSI).

Modify the check to show a scary wall of text if non-compliance-GSI
products tried to set PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT,
instead of erroring out immediately.
Also add gsi_car_arm64 & gsi_car_x86_64 to the list of eligible GSI
product names.

After this change, any product can set
PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT for development purposes, but
only GSI products that specifies `--allow_gsi_debug_sepolicy` during
image signing can release sign a product built with
PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT.

Bug: 188067818
Test: Presubmit
Test: lunch gsi_arm64-userdebug && m nothing  # => no warning
Change-Id: I34ef49af29c7064bea8924b0070793f1e78256bf
2022-01-06 06:37:05 +00:00
Jacky Liu
bff997fd1f Merge "Add PRODUCT_EXTRA_OTA_KEYS to add extra ota keys in otacerts.zip" 2022-01-06 06:31:37 +00:00
Bill Yi
f6125cb188 Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE
Merged-In: Idef27f4e0cd2e7a44a74a7be00fcc897d0a54128
Change-Id: Ice7e337af7767a7c1a66a66c11fa37a8a69476df
2022-01-05 21:10:46 -08:00
Treehugger Robot
e2d7185a0f Merge "Calls check-and-set-avb-args() when the system.img exists" am: 99bec02344 am: 7238491c1c am: a0e28118af am: 3f357470d2
Original change: https://android-review.googlesource.com/c/platform/build/+/1934176

Change-Id: I73827e38bf2f3a57affea93ba6c9745d3e5111c3
2022-01-06 05:09:00 +00:00
Treehugger Robot
3f357470d2 Merge "Calls check-and-set-avb-args() when the system.img exists" am: 99bec02344 am: 7238491c1c am: a0e28118af
Original change: https://android-review.googlesource.com/c/platform/build/+/1934176

Change-Id: I5bfe28ee0af83c4946eb8ad6ba05f5a770eeecb3
2022-01-06 04:47:55 +00:00
Treehugger Robot
a0e28118af Merge "Calls check-and-set-avb-args() when the system.img exists" am: 99bec02344 am: 7238491c1c
Original change: https://android-review.googlesource.com/c/platform/build/+/1934176

Change-Id: Idef27f4e0cd2e7a44a74a7be00fcc897d0a54128
2022-01-06 04:26:45 +00:00
Treehugger Robot
99bec02344 Merge "Calls check-and-set-avb-args() when the system.img exists" 2022-01-06 03:58:08 +00:00
Devin Moore
8f498f4694 Merge "Add prebuilt init_boot.img to PREBUILT_IMAGES/" am: 1c33419ed0 am: ba7dcae84b am: 92ff95e7a3 am: ddd21ed1da
Original change: https://android-review.googlesource.com/c/platform/build/+/1936571

Change-Id: Ie2ce394f76829451cc812ff62a2477dde4e516cc
2022-01-05 18:23:24 +00:00
Treehugger Robot
7d545aa727 Merge "Remove GKI_SIGNING args from recovery & debug boot image build rules" am: 5203f2b1e0 am: af48f4be53 am: 259deaacd8 am: dca625aed6
Original change: https://android-review.googlesource.com/c/platform/build/+/1934208

Change-Id: I32eeb7971a360c4654d040e5905bfa2959456354
2022-01-05 18:22:47 +00:00
Devin Moore
ddd21ed1da Merge "Add prebuilt init_boot.img to PREBUILT_IMAGES/" am: 1c33419ed0 am: ba7dcae84b am: 92ff95e7a3
Original change: https://android-review.googlesource.com/c/platform/build/+/1936571

Change-Id: I7a24da87b7bdbc830f7fddfda1c4f4291ab52fcd
2022-01-05 17:52:05 +00:00
Treehugger Robot
dca625aed6 Merge "Remove GKI_SIGNING args from recovery & debug boot image build rules" am: 5203f2b1e0 am: af48f4be53 am: 259deaacd8
Original change: https://android-review.googlesource.com/c/platform/build/+/1934208

Change-Id: I76a0b8e56bf8e269d170f9159bdb306e199c084f
2022-01-05 17:51:55 +00:00
Devin Moore
92ff95e7a3 Merge "Add prebuilt init_boot.img to PREBUILT_IMAGES/" am: 1c33419ed0 am: ba7dcae84b
Original change: https://android-review.googlesource.com/c/platform/build/+/1936571

Change-Id: I26964a077c8ed0e8a461e6b9de43297cc533f21a
2022-01-05 17:40:07 +00:00
Treehugger Robot
259deaacd8 Merge "Remove GKI_SIGNING args from recovery & debug boot image build rules" am: 5203f2b1e0 am: af48f4be53
Original change: https://android-review.googlesource.com/c/platform/build/+/1934208

Change-Id: I7e89eb2089c29eae549af1712ad60f8c619232b4
2022-01-05 17:33:56 +00:00
Devin Moore
1c33419ed0 Merge "Add prebuilt init_boot.img to PREBUILT_IMAGES/" 2022-01-05 17:22:17 +00:00
Treehugger Robot
5203f2b1e0 Merge "Remove GKI_SIGNING args from recovery & debug boot image build rules" 2022-01-05 17:00:26 +00:00
Jacky Liu
beb0b6927c Add PRODUCT_EXTRA_OTA_KEYS to add extra ota keys in otacerts.zip
Equivalent to PRODUCT_EXTRA_RECOVERY_KEYS but for A/B OTA.

Bug: 211848136
Test: set PRODUCT_EXTRA_OTA_KEYS and check otacerts.zip
Change-Id: I81e27d12a22b405f6227b09c01ed684dfcede19e
2022-01-05 17:54:40 +08:00
Yi-Yo Chiang
cd6de3d8bb Remove GKI_SIGNING args from recovery & debug boot image build rules
These options are for certifying official GKI release, so they should
never be added to build command of recovery.img and boot-debug.img.

Also define gki_signing_signature_args in misc_info.txt iff.
BOARD_GKI_SIGNING_KEY_PATH is defined, so there's one less conditional.
We need to define it even if BOARD_GKI_SIGNING_SIGNATURE_ARGS is empty,
so that sign_target_files_apks.py can modify the option during image
signing.

Bug: 210367929
Test: Presubmit
Change-Id: I9546fcda796586d97af244955e15c1b8dc9f6d92
2022-01-05 02:59:45 +00:00
yangbill
724565d885 Export test data dependencies in module-info
Add the list of targets that are handled as data inputs and
required by tests at runtime.

Bug: 205726862
Test: m out/target/product/vsoc_x86_64/module-info.json
Change-Id: Id1468ebaf8f72cf37787f3cc514a29724c115db5
2022-01-05 10:34:51 +08:00
Treehugger Robot
6d0db50091 Merge "Fix images-for-partitions() for 'init_boot'" am: 8beddf2e7e am: a2b19d4e51 am: 8949fd3676 am: 70ffb1e3ba
Original change: https://android-review.googlesource.com/c/platform/build/+/1934174

Change-Id: I62e9fc05d0fbe769550f68eb40cd5cd4efb9ece5
2022-01-05 02:21:38 +00:00
Treehugger Robot
70ffb1e3ba Merge "Fix images-for-partitions() for 'init_boot'" am: 8beddf2e7e am: a2b19d4e51 am: 8949fd3676
Original change: https://android-review.googlesource.com/c/platform/build/+/1934174

Change-Id: I71dbc07bd5b456991d945928bf28bb056cc0340a
2022-01-05 02:02:57 +00:00
Treehugger Robot
8949fd3676 Merge "Fix images-for-partitions() for 'init_boot'" am: 8beddf2e7e am: a2b19d4e51
Original change: https://android-review.googlesource.com/c/platform/build/+/1934174

Change-Id: Ica4eb30dc21573c675db7e6585c5f0043bf32572
2022-01-05 01:50:23 +00:00
Treehugger Robot
8beddf2e7e Merge "Fix images-for-partitions() for 'init_boot'" 2022-01-05 01:21:00 +00:00
Devin Moore
cda41f0709 Add prebuilt init_boot.img to PREBUILT_IMAGES/
It was incorrectly being added to IMAGES/

Bug: 203698939
Test: m
Change-Id: I3c4ae46388a7f043c7bb22b78795277868422a01
2022-01-05 00:22:55 +00:00
Treehugger Robot
b13d845d70 Merge "Add Soong variable for optimizing SystemUI Java" am: 3293a959ad am: eeb0c000b6 am: 681241456f am: a1d0c2166d
Original change: https://android-review.googlesource.com/c/platform/build/+/1931304

Change-Id: Ia950eea351a7d33f93a7941c7f1c2245e8f719e2
2022-01-04 20:30:04 +00:00
Treehugger Robot
a1d0c2166d Merge "Add Soong variable for optimizing SystemUI Java" am: 3293a959ad am: eeb0c000b6 am: 681241456f
Original change: https://android-review.googlesource.com/c/platform/build/+/1931304

Change-Id: I38f72ae5c493a1be498d72064b20bb7644725067
2022-01-04 19:30:46 +00:00
Treehugger Robot
681241456f Merge "Add Soong variable for optimizing SystemUI Java" am: 3293a959ad am: eeb0c000b6
Original change: https://android-review.googlesource.com/c/platform/build/+/1931304

Change-Id: I518efcfe2946713b9e26f27f3b930a80e0ee6719
2022-01-04 19:14:49 +00:00
Treehugger Robot
3293a959ad Merge "Add Soong variable for optimizing SystemUI Java" 2022-01-04 18:40:09 +00:00
Bowgo Tsai
e691aef7b1 Calls check-and-set-avb-args() when the system.img exists
Some targets, e.g., the newly added `gki_arm64`:
https://r.android.com/1935340, have no system.img.

To avoid the build error when making the vbmeta.img on a no-system-image
target, only sets system.img's AVB settings when it exists,.

Bug: 212486689
Test: `lunch gki_arm64-userdebug; make` with BOARD_AVB_ENABLE := true
Change-Id: I5e3c531e74116e421506a86ffce83848e7a9d6ea
2022-01-04 17:41:01 +08:00
Bowgo Tsai
4f62aa0899 Fix images-for-partitions() for 'init_boot'
Macro images-for-partitions() returns $(INSTALLED_INIT_BOOTIMAGE_TARGET)
for the 'init_boot' partition, which is empty. It should return
$(INSTALLED_INIT_BOOT_IMAGE_TARGET) instead.

Bug: 203698939
Test: `make` without chaining 'init_boot' partition
Change-Id: I387813283dfad7e1b2f762a5fa4065775977caf7
2022-01-04 17:29:03 +08:00
SzuWei Lin
c230b0b0c9 Fix build error on empty root folder
If a build target does not contain system image, it doesn't
output anything to root folder. The patch fix the build error for
the case the root folder is empty.

Bug: 212486689
Test: make bootimage dist
Test: Build pass
Change-Id: I4f1376eb7e615f48171ed9c3057c5a78074abaa6
2021-12-30 13:48:01 +08:00
Jiyong Park
7563ad7b11 Merge "Reland: Add NEED_AIDL_NDK_PLATFORM_BACKEND" into sc-qpr1-dev-plus-aosp 2021-12-24 02:34:34 +00:00
Jared Duke
9c261d0b07 Add Soong variable for optimizing SystemUI Java
Introduce a Soong variable to allow selective enabling of Java
optimizations for SystemUI. This is analogous to the
`SYSTEM_OPTIMIZE_JAVA` flag, but scoped just to SystemUI,
decoupling the feature from system server-related development.

Opting in to optimizations can be achieved with either:
  * Env:
export SYSTEMUI_OPTIMIZE_JAVA=true
  * Make:
$(call add_soong_config_var_value,ANDROID,SYSTEMUI_OPTIMIZE_JAVA,true)

Note that the build rule changes to hook into this variable will
land separately.

Bug: 203088572
Test: `SYSTEMUI_OPTIMIZE_JAVA=true m` (observe env variable change log)
Change-Id: I24b4b76cdf844e3c00735e19e69898867162c81d
2021-12-23 09:29:30 -08:00
Devin Moore
5847b680c8 Merge changes from topic "init_boot_img" am: 6363a04e79 am: 1368d81efa am: 2bc48d1025 am: fa9ffed08d
Original change: https://android-review.googlesource.com/c/platform/build/+/1920818

Change-Id: I0f56b8f39335731483ee004bc18a5153518f4423
2021-12-23 00:30:02 +00:00
Devin Moore
fa9ffed08d Merge changes from topic "init_boot_img" am: 6363a04e79 am: 1368d81efa am: 2bc48d1025
Original change: https://android-review.googlesource.com/c/platform/build/+/1920818

Change-Id: I2624bc5a38be1c5742e2b80c3de916e22b526415
2021-12-23 00:13:10 +00:00
Devin Moore
2bc48d1025 Merge changes from topic "init_boot_img" am: 6363a04e79 am: 1368d81efa
Original change: https://android-review.googlesource.com/c/platform/build/+/1920818

Change-Id: Ibca1c0c3105c0d2ee53f7db6795ac567a17a0269
2021-12-22 23:56:55 +00:00
Devin Moore
6363a04e79 Merge changes from topic "init_boot_img"
* changes:
  Update releasetools for new init_boot.img
  Build a new init_boot.img that contains the boot ramdisk
2021-12-22 23:21:17 +00:00
Treehugger Robot
e269d2cb9a Merge "Fix make conditional" am: 3e315b9afc am: b5560e2fc4 am: f2bf87a8ff am: eabf1e38fa
Original change: https://android-review.googlesource.com/c/platform/build/+/1931200

Change-Id: Ia7ee51630f9adef18a3fd3c2e47832631aa1bace
2021-12-22 18:45:38 +00:00
Treehugger Robot
eabf1e38fa Merge "Fix make conditional" am: 3e315b9afc am: b5560e2fc4 am: f2bf87a8ff
Original change: https://android-review.googlesource.com/c/platform/build/+/1931200

Change-Id: Ic8317970e60153b6b92747e8fb12b658bd0e8150
2021-12-22 18:33:36 +00:00
Treehugger Robot
f2bf87a8ff Merge "Fix make conditional" am: 3e315b9afc am: b5560e2fc4
Original change: https://android-review.googlesource.com/c/platform/build/+/1931200

Change-Id: I41dcc99125aa10d800c9df8cf83f308b085747d4
2021-12-22 18:23:08 +00:00