Commit graph

73373 commits

Author SHA1 Message Date
Treehugger Robot
2a04f251b9 Merge "Export test data dependencies in module-info" am: 802c86f831
Original change: https://android-review.googlesource.com/c/platform/build/+/1928387

Change-Id: I017a5d9c3cd227e0b1a4deaa8dface646bc0a887
2022-01-07 00:54:01 +00:00
Treehugger Robot
802c86f831 Merge "Export test data dependencies in module-info" 2022-01-07 00:36:54 +00:00
Spandan Das
362bf03c3b Merge "Move manifest generation logic into static_java_library.mk" am: 13daf3d4a2
Original change: https://android-review.googlesource.com/c/platform/build/+/1835800

Change-Id: Ic71cff4d144e66e4528da4afe9b799eabb4aa723
2022-01-06 22:40:27 +00:00
Spandan Das
13daf3d4a2 Merge "Move manifest generation logic into static_java_library.mk" 2022-01-06 22:21:03 +00: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
7e2a59a139 Merge "Fix build error on empty root folder" am: e33e7e518c
Original change: https://android-review.googlesource.com/c/platform/build/+/1934213

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

Change-Id: I46e405153c4a87a960d037312eb99c31103c8efc
2022-01-06 06:43:51 +00:00
Treehugger Robot
ba922579b1 Merge "Fix the signing error on no-system-image targets" am: 790214a4c9
Original change: https://android-review.googlesource.com/c/platform/build/+/1936199

Change-Id: Ibc68ce8875eb50e4e52526787a48ceece66f2f42
2022-01-06 06:43:41 +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
Treehugger Robot
790214a4c9 Merge "Fix the signing error on no-system-image targets" 2022-01-06 06:27:17 +00:00
Treehugger Robot
7238491c1c Merge "Calls check-and-set-avb-args() when the system.img exists" am: 99bec02344
Original change: https://android-review.googlesource.com/c/platform/build/+/1934176

Change-Id: Iefb3ca4f4b5ccd562fc2502f480a53e29d6bec05
2022-01-06 04:14:33 +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
Treehugger Robot
756adcf38b Merge "Show directories and files with most warnings." am: b2610d7ecd
Original change: https://android-review.googlesource.com/c/platform/build/+/1927679

Change-Id: I9689ecd94e9258444c35f144a41cf832f077cb67
2022-01-06 03:32:18 +00:00
Treehugger Robot
b2610d7ecd Merge "Show directories and files with most warnings." 2022-01-06 03:19:15 +00:00
Chih-Hung Hsieh
d4691ecfb6 Show directories and files with most warnings.
* Now with 4 sections that can be shown/hidden independently.
* After the 'selected_projects' section, add two more sections:
  * 'top_directory_section' contains
    * a table of directories with at least 1% warnings.
    * a 'selected_directory_warnings' subsection to show all warnings
      in the clicked directory from the directory table
  * 'top_file_section' contains
    * a table of files with at least 100 or 1% warnings.
    * a 'selected_file_warnings' subsection to show all warnings
      in the clicked file from the file table
* Adjust button/section spaces and reduce button font size to 100%.
* Rename drawTable to genTables.

Test: warn.py --url=http://cs/android --separator='?l=' build.log > warnings.html
Test: warn.py --gencsv build.log > warnings.csv
Change-Id: I765b09a46adc111cfe781719ba7aa0f917aa6ffc
2022-01-05 15:43:52 -08:00
Steven Moreland
8e9e313bf4 Merge "Don't require current.txt order." am: 9ca3c34646
Original change: https://android-review.googlesource.com/c/platform/build/+/1932881

Change-Id: I8b0516bc88a7ff47beff54f3c9ca5127b1244da1
2022-01-05 22:25:21 +00:00
Steven Moreland
9ca3c34646 Merge "Don't require current.txt order." 2022-01-05 22:09:27 +00:00
Wei Su
5d03df4516 Merge "Write files in a temporary directory" am: 22ecce0658
Original change: https://android-review.googlesource.com/c/platform/build/+/1920697

Change-Id: I1e9dad365256cab96ac06c35f4d87c9cb54704d1
2022-01-05 20:16:49 +00:00
Wei Su
22ecce0658 Merge "Write files in a temporary directory" 2022-01-05 20:03:07 +00:00
Treehugger Robot
ecf39825f0 Merge "Convert generate-self-extracting-archive.py to python 3" am: 7ca77ea994
Original change: https://android-review.googlesource.com/c/platform/build/+/1935067

Change-Id: I0ecbc11985f863f5e07b5ddce60f0d2ec21bca9c
2022-01-05 19:14:17 +00:00
Treehugger Robot
7ca77ea994 Merge "Convert generate-self-extracting-archive.py to python 3" 2022-01-05 18:58:58 +00:00
Devin Moore
ba7dcae84b Merge "Add prebuilt init_boot.img to PREBUILT_IMAGES/" am: 1c33419ed0
Original change: https://android-review.googlesource.com/c/platform/build/+/1936571

Change-Id: I01cc13d6fa40602cc52ad06ee38edcdbd29bd788
2022-01-05 17:34:45 +00:00
Devin Moore
1c33419ed0 Merge "Add prebuilt init_boot.img to PREBUILT_IMAGES/" 2022-01-05 17:22:17 +00:00
Treehugger Robot
af48f4be53 Merge "Remove GKI_SIGNING args from recovery & debug boot image build rules" am: 5203f2b1e0
Original change: https://android-review.googlesource.com/c/platform/build/+/1934208

Change-Id: I6864296552846e9fc85d807c62fb12b613b3fa15
2022-01-05 17:16:07 +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
a2b19d4e51 Merge "Fix images-for-partitions() for 'init_boot'" am: 8beddf2e7e
Original change: https://android-review.googlesource.com/c/platform/build/+/1934174

Change-Id: Ib09c4b73cdcc1b4da56161f37b7dd8bdf4f029d0
2022-01-05 01:34:10 +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
eeb0c000b6 Merge "Add Soong variable for optimizing SystemUI Java" am: 3293a959ad
Original change: https://android-review.googlesource.com/c/platform/build/+/1931304

Change-Id: I47784b38692b7ae11fc433eefbca6fee636abd1c
2022-01-04 18:55:59 +00:00
Treehugger Robot
3293a959ad Merge "Add Soong variable for optimizing SystemUI Java" 2022-01-04 18:40:09 +00:00
Bowgo Tsai
8d4b72405e Fix the signing error on no-system-image targets
Currently when running sign_target_files_apks on a no-system-image
target, it will raise the following error:

  ValueError: max() arg is an empty sequence

This is because there is no APK files in the target_files.zip.
Fixing this by setting maxsize to zero in this case.

Bug: 213028932
Test: lunch gki_arm64-userdebug; make dist
Test: sign_target_files_apks \
        --gki_signing_key=external/avb/test/data/testkey_rsa4096.pem \
        --gki_signing_algorithm=SHA256_RSA4096 \
        --gki_signing_extra_args="--prop gki:prop1 --prop gki:prop2" \
        ./out/dist/*-target_files-eng.*.zip signed.zip
Change-Id: I40daecbc2ff3f89d3e635d1a4a1c1dea31ba9a27
2022-01-04 17:55:19 +08: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
Cole Faust
547ca205ae Convert generate-self-extracting-archive.py to python 3
Test: Add a VENDOR_BLOBS_LICENSE entry to an existing product, then `m with-license`
Bug: 203436762
Change-Id: I4bbe77bda7789b6c44bea141518b1cd2e699d326
2021-12-29 13:58:28 -08:00
Treehugger Robot
87d6967714 Merge "Re-landing "removing gsi_keys.mk"" am: 8c861cec97
Original change: https://android-review.googlesource.com/c/platform/build/+/1931644

Change-Id: I5166c67417fd03ea1c77a7015f9413c7c2596cba
2021-12-27 03:09:46 +00:00
Treehugger Robot
8c861cec97 Merge "Re-landing "removing gsi_keys.mk"" 2021-12-27 02:50:48 +00:00
Treehugger Robot
aabf327615 Merge "--sign_tool is an optional flag applicable to virtApex." am: ff3a1c73cf
Original change: https://android-review.googlesource.com/c/platform/build/+/1933021

Change-Id: I121cb833348795c7dc64ef774456da8e171fb5bc
2021-12-24 11:22:08 +00:00
Treehugger Robot
ff3a1c73cf Merge "--sign_tool is an optional flag applicable to virtApex." 2021-12-24 10:59:21 +00:00
Baligh Uddin
06cc018629 --sign_tool is an optional flag applicable to virtApex.
For not virtApex, this results in a KeyError.
line 151, in <module>\n', '  File
"/usr/local/google/home/baligh/clients/goog/master/out/host/linux-x86/bin/sign_apex/sign_apex.py",
line 144, in main\n', "KeyError: 'sign_tool'\n"]

BUG: 193504286
Test: TH
Change-Id: Id982e5c57086ada78168163d2293813df121847d
2021-12-24 06:17:47 +00:00
Bowgo Tsai
b30a23cca2 Re-landing "removing gsi_keys.mk"
It's no longer required to install the compliance GSI
public keys into the ramdisk. Those public keys just need
to be included in the VTS test suite for GSI verification.

Bug: 176869478
Test: TreeHugger
Change-Id: I3714de75b94be43a1364b89b92d893b336aa014b
2021-12-24 12:28:32 +08:00
Steven Moreland
15b89d8fcd Don't require current.txt order.
There have been a lot of merge conflicts because of this file (and a
few cases of people needing to merge changes internally because of
it). Though, we really don't care about the order of the file. So,
compare ignoring order. If there is a merge conflict in the future,
we can change the order slightly, and we can gradually clean up the
order over time, as needed (really, it's not important).

Bug: N/A
Test: file reordered as build-time check
Change-Id: I955a2bd78872ff6d975bc494f10b2ed5e532c680
2021-12-23 22:18:42 +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
1368d81efa Merge changes from topic "init_boot_img" am: 6363a04e79
Original change: https://android-review.googlesource.com/c/platform/build/+/1920818

Change-Id: Ib49ac64a178ce649011a20709e44c8f1f4837bb4
2021-12-22 23:33:33 +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
3cc272c031 Merge "Update comments for Makefile variables about APEX jars." am: e685560087
Original change: https://android-review.googlesource.com/c/platform/build/+/1931602

Change-Id: I11bff7adff7233683daa605bfc9c34d0d6cfcaf6
2021-12-22 18:54:20 +00:00