Commit Graph

68758 Commits

Author SHA1 Message Date
Jingwen Chen
0e4eba1544 Remove module_name_to_label short circuit from m.
This wasn't adding much value, let's remove it for now until we decide
on how mixed builds will be exposed for users later.

Test: USE_BAZEL_ANALYSIS=1 m droid
Change-Id: I16465fd7759646964ea8c50aab6ab91f47c5e8d1
2021-09-17 08:45:30 +00:00
David Anderson
dfc9d7912f Merge "Avoid too much reserved_size for erofs image" 2021-09-16 19:36:29 +00:00
Treehugger Robot
258fca9a8f Merge "Move the stable code from version_defaults.mk to version_util.mk." 2021-09-16 18:56:09 +00:00
Daniel Norman
a529e0fd2e Merge "Build vendor images first when rebuilding with vendor_otatools." 2021-09-16 17:29:43 +00:00
Yuntao Xu
a1b1f638d3 Merge "Add android-cts-verifier.zip" 2021-09-16 17:06:16 +00:00
Treehugger Robot
389170f9ec Merge "Clean up gki-5.4 related rules in GSI" 2021-09-16 09:22:59 +00:00
Yuntao Xu
26b9e3ba31 Add android-cts-verifier.zip
Adding android-cts-verifier.zip to $(HOST_OUT)/cts-verifier at
build/make/core/tasks/cts.mk.

Bug: 190635892
Test: m cts
Test: TreeHugger
Change-Id: I63b2da75391221119025b597257c26906718cf77
Merged-In: I63b2da75391221119025b597257c26906718cf77
2021-09-15 18:04:04 -07:00
Daniel Norman
78554ea568 Build vendor images first when rebuilding with vendor_otatools.
Only supports rebuilding vendor.img and odm.img currently.

This allows "other" images (e.g. vbmeta, super_empty, ...) to
be rebuilt using the latest tooling.

Bug: 188491126
Bug: 192422274
Test: Sign a GRF R+S merged target_files package using:
      sign_target_files_apks \
        --vendor_otatools=<otatools.zip from R> \
	--vendor_partitions=vendor,odm \
	merged-target_files.zip \
	signed-target_files.zip
Change-Id: Ib93aea9f083ee9b722c31a42dcc780b5222053b8
2021-09-15 21:53:25 +00:00
Yuntao Xu
3d4c52d6ed Merge "Add the cts-platform-version check" 2021-09-15 21:28:54 +00:00
Treehugger Robot
dcc78a8f0a Merge "Ensure RBE_CXX_POOL and RBE_JAVA_POOL variables work as expected" 2021-09-15 07:53:22 +00:00
Kousik Kumar
2b2b87fe80 Ensure RBE_CXX_POOL and RBE_JAVA_POOL variables work as expected
These environment variables are not being passed onto compile actions created from makefiles. This change makes sure that these env variables are passed along so that we are able to update the C++ / Javac pool being used

Test: Ran a build with RBE_CXX_POOL=cpp_next to test the next pool
Bug: b/199774309
Change-Id: Icd47d3647b962a6c3ac712369466d5502b817fd7
2021-09-14 21:31:38 -04:00
Treehugger Robot
50ec71eac8 Merge "Zipalign: Avoid unnecessary padding" 2021-09-15 00:34:44 +00:00
Guang Zhu
f934e69049 Merge "update build rules to use /data/local/tests/unrestricted" 2021-09-15 00:22:43 +00:00
Fabien Sanglard
df73d1b473 Zipalign: Avoid unnecessary padding
Problem: Aligned entry always get padded to the next aligned slot.
Solution: Fix alignment test.

Bug: 199932309
Test: align_test.cpp
Change-Id: I1e61c67dcf45454dd782d0fcc6903f7e71954083
2021-09-14 15:20:42 -07:00
Christopher Ferris
fe9efa5a61 Merge "Make the script python3." 2021-09-14 21:03:01 +00:00
Greg Kaiser
d9c6d5fc91 Merge "Revert "Rebuild vendor images in sign_target_files_apks with vendor otatools."" 2021-09-14 19:38:29 +00:00
Greg Kaiser
e086f7222e Revert "Rebuild vendor images in sign_target_files_apks with vendor otatools."
This reverts commit a1094e9f0c.

Reason for revert: Likely cause for b/199911935

Change-Id: Ib20400cc2f740a26fbbfb0da34fdf20ed7dc620e
2021-09-14 19:32:27 +00:00
Guang Zhu
a736c45a95 update build rules to use /data/local/tests/unrestricted
... for native tests. This new location has the appropriate
settings for debuggerd to generate valid backtraces in case
of test binary crash.

Bug: 167308193
Bug: 199904562
Test: compile
Change-Id: Id727355ecc87415ba1e7ccc41ec55d2f6f5fc6f1
2021-09-14 10:58:14 -07:00
Treehugger Robot
c13f049bcd Merge "Zipalign: Remove unused variables" 2021-09-14 16:52:29 +00:00
Rob Seymour
ab5492c72c Merge "Add fake host snapshot support" 2021-09-14 14:47:03 +00:00
Treehugger Robot
a83a19d41e Merge "Skip building boot-(test-harness|debug).img if not needed" 2021-09-14 09:09:56 +00:00
Yuntao Xu
89c09d9ab9 Add the cts-platform-version check
Added the cts-platform-version check when the cts directory exists.

Bug: 194402596
Test: manually modified the ifeq condition to check error message
Test: TreeHugger
Change-Id: I613ac5b5014dbf4e6202e1dbd1b6a92359817cf2
Merged-In: I613ac5b5014dbf4e6202e1dbd1b6a92359817cf2
2021-09-14 05:17:45 +00:00
Howard Chen
cb6ea4a2a7 Clean up gki-5.4 related rules in GSI
There will be no android13-5.4. This CL is to clean up build rules
that refers to the gki-5.4.

Bug: 199807830
Test: lunch aosp_arm64-userdebug
Change-Id: Ia982eb2ee3d1eb64db72c1836e433bcc53e71e3f
2021-09-14 03:38:06 +00:00
Fabien Sanglard
1011d45f5b Zipalign: Remove unused variables
Remove unused variable resulting in compilation warnings.
Remove unused temporary variable.

Bug: NA
Test: zipalign_tests
Change-Id: Ic2236b5878074f0c2537ab0b9f94dfd9c42225d8
2021-09-13 16:52:22 -07:00
Christopher Ferris
6a54633796 Make the script python3.
Test: Ran the python version of the script and the python3 version
Test: and verified the output is the same. This is for all three
Test: outputs (html, text, xml).
Test: Builds without an error.
Change-Id: I5138b0a1efbbc3ab764c644afc1783c79fd7e250
2021-09-13 14:54:58 -07:00
Daniel Norman
97e0c2831d Merge "Rebuild vendor images in sign_target_files_apks with vendor otatools." 2021-09-13 20:12:11 +00:00
Sasha Smundak
1335903d4e Move the stable code from version_defaults.mk to version_util.mk.
With version_defaults.mk containing only simple assignments, it can be
automatically converted to Starlark.
This is a cherrypick of ag/15768054

Bug: 198995713
Test: treehugger
Merged-In: I4798fb69c639e6d52d275a5b793fa0c8ba876202
Change-Id: I17fab2e46c085fc4c07ae13c5e8cfb439097c634
2021-09-13 09:23:40 -07:00
Rob Seymour
be609fb144 Add fake host snapshot support
Map HOST_FAKE_SNAPSHOT_ENABLE to HostFakeSnapshotEnabled() method.

Bug: 194799048
Test: m HOST_FAKE_SNAPSHOT_ENABLE=true host-fake-snapshot dist -- check snapshot exists in dist

Change-Id: Idd343c3dec3cc24514a5d587b06c3b1300598b7d
2021-09-13 15:59:05 +00:00
Huang Jianan
6552727e03 Avoid too much reserved_size for erofs image
After the erofs image is built, it won't be modified again. The reserve
room is only used for the hash footer. There is no need to set an
excessive margin.

Bug: 199248596
Test: erofs image size is smaller than before
Signed-off-by: Huang Jianan <huangjianan@oppo.com>
Change-Id: If2535b9ad2c2d60bea74feeca576a168387ff341
2021-09-13 02:03:13 +00:00
Yifan Hong
1ab1c2ff96 Merge "Avoid repeated building of erofs image" 2021-09-11 00:05:45 +00:00
Bob Badour
08472a6b4b Merge "Re-call BUILD_NOTICE_FILE for modules that add deps" 2021-09-10 16:59:06 +00:00
Yi Kong
c48a9fb19c Merge "Fix arguments passed to llvm-readobj" 2021-09-10 15:15:08 +00:00
Yi Kong
8b50dea627 Fix arguments passed to llvm-readobj
Upstream llvm-readobj no longer accepts single dash prefix for long
options. Changed to double dash.

Also let the script to raise exception if rc is non-zero, to avoid
getting confusing error later in the program.

Test: build
Bug: 197230471
Change-Id: I364f51322904431d430549f79af58f455f47e028
2021-09-10 21:17:45 +08:00
Tianjie Xu
48662b25fc Merge "Add option to override minor version" 2021-09-10 05:48:01 +00:00
Bill Yi
7039269418 Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE" 2021-09-09 21:27:25 +00:00
Bob Badour
58c4535b7e Re-call BUILD_NOTICE_FILE for modules that add deps
The normal pattern is:

1. Set a bunch of variables like LOCAL_MODULE
2. Include a makefile specific to the module type
3. The included file in turn includes base_rules.mk
4. At the end of base_rules.mk, it include notice_files.mk
5. The included file declares a build rule and finishes.

The below files included for some module types add additional
dependencies after returning from base_rules.mk, which are not
reflected in the notice files.

Including notice_files.mk a 2nd time adds these dependencies.

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Test: m systemlicense

Change-Id: I030399ffb13a2cfb58cf583ae5a2e418f5dbc534
2021-09-09 20:09:13 +00:00
Tianjie
e7ab38d964 Add option to override minor version
Pass the minor version override to delta_generator. So we can test
features in tradefed before releasing it to droidfoods.

Bug: 197361113
Test: TH
Change-Id: Ie8846935dfa13784f0745513be13811908f44ac3
2021-09-09 12:16:19 -07:00
Daniel Norman
a1094e9f0c Rebuild vendor images in sign_target_files_apks with vendor otatools.
This is needed until image compilation tooling is backwards compatible.

Bug: 188491126
Bug: 192253131
Bug: 192422274
Test: Sign a GRF R+S merged target_files package using:
      sign_target_files_apks \
        --vendor_otatools=<otatools.zip from R> \
	--vendor_partitions=vendor,odm,vbmeta \
	merged-target_files.zip \
	signed-target_files.zip
Change-Id: Iec208f544b56f8ed577344d8d6ca904773d8baab
2021-09-09 17:32:22 +00:00
Bowgo Tsai
4bb4d1fb91 Skip building boot-(test-harness|debug).img if not needed
boot-(test-harness|debug).img is not needed for devices with
a /vendor_boot partition. They can use vendor_boot-(test-harness|debug).img
instead.

Bug: 196001476
Test: make then checks $OUT/*.img
Change-Id: If76df0329c96f718ebf0a0ac138cde3ae859a6c6
2021-09-09 19:04:55 +08:00
Huang Jianan
ffa1d57819 Avoid repeated building of erofs image
The image size of erofs is only affected by the content of the input
file, so it doesn't care about the input image_size. In addition, the
build time of erofs image is longer than ext4 due to compression. Only
execute mkfs once to reduce unnecessary time consumption.

Bug: 199248596
Test: erofs image build faster than before
Signed-off-by: Huang Jianan <huangjianan@oppo.com>
Change-Id: I23a4e640d5066485de3fea0f808998045e716d1f
2021-09-09 14:18:59 +08:00
Sarah Chin
355f345956 Merge "Add Radio AIDL to VNDK" 2021-09-09 05:21:43 +00:00
Bill Yi
82731b2c2b Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE
Merged-In: Ia11cb981f28bec05ba4019a3a05126be5059697e
Merged-In: I80d428b99bd42a98ae1ae4a837447da19478c01e
Merged-In: I80d428b99bd42a98ae1ae4a837447da19478c01e
Change-Id: Ic7a5c91900588666ef3c6ed152ae2d80ca13772d
2021-09-08 18:01:21 -07:00
David Anderson
c01c341b6a Merge "Don't sparse right-sized ext4 and erofs images." 2021-09-08 22:25:37 +00:00
Sarah Chin
59f77a7249 Add Radio AIDL to VNDK
Test: build
Bug: 198331182
Change-Id: I95d089fb23c4a3baa7f7a6c1435099f34a1af5a3
Merged-In: I95d089fb23c4a3baa7f7a6c1435099f34a1af5a3
2021-09-08 17:31:22 +00:00
Treehugger Robot
2126602216 Merge "Allow overriding SOONG_CONFIG_art_module_source_build to false." 2021-09-08 15:04:57 +00:00
Lukács T. Berki
f999a9d145 Merge "Remove soong_docs from droidcore." 2021-09-08 13:16:50 +00:00
Treehugger Robot
2215f2cbae Merge "Disable the delete_all_keys feature for GSI" 2021-09-08 08:01:23 +00:00
Lukacs T. Berki
043f3a1897 Remove soong_docs from droidcore.
soong_docs will be run directly from soong_ui so it won't have a
corresponding Make target.

Test: Presubmits.
Change-Id: Id7abccdf2ea3830edf6043c10b617bddf4f9c86d
2021-09-08 08:24:33 +02:00
Howard Chen
994e4a54f4 Disable the delete_all_keys feature for GSI
Bug: 197914756
Test: run GSI with DSU on a Pixel device

Change-Id: I78ee95f99764bee71bf3bcccb992ee35fa80603b
2021-09-08 13:18:10 +08:00
Linzhao Ye
cfa99e3596 Merge "Add Wifi HostApd AIDL interface support." 2021-09-07 17:15:33 +00:00