Commit graph

71531 commits

Author SHA1 Message Date
TreeHugger Robot
51b135732f Merge "Revert "Add the cts-platform-version check"" into stage-aosp-master 2021-09-15 08:16:31 +00:00
Treehugger Robot
46b9fe39ac Merge "Ensure RBE_CXX_POOL and RBE_JAVA_POOL variables work as expected" am: dcc78a8f0a
Original change: https://android-review.googlesource.com/c/platform/build/+/1826981

Change-Id: Ia05ae800c3d10fb07e16fdc9a7fe6a8bf21e748f
2021-09-15 08:09:01 +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
Yuntao Xu
712cf0a586 Revert "Add the cts-platform-version check"
Revert submission 15776724-rewrite cts-platform-version-check module

Reason for revert: merge conflicts with sc-dev-plus-aosp
Reverted Changes:
I7d018d2b3:Remove os/Android.mk
I613ac5b50:Add the cts-platform-version check

Change-Id: Ic4a9c58c46ffadb5fcaadd1649e54a9fa2a69285
2021-09-15 05:10:34 +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
Yuntao Xu
61ba5389a7 Merge "Add the cts-platform-version check" into stage-aosp-master 2021-09-15 01:00:36 +00:00
Treehugger Robot
4e23cac241 Merge "Zipalign: Avoid unnecessary padding" am: 50ec71eac8
Original change: https://android-review.googlesource.com/c/platform/build/+/1826624

Change-Id: I4a5cfe56ff9fc6788934c059eb5c35d42d7da4a4
2021-09-15 00:49:00 +00:00
Treehugger Robot
50ec71eac8 Merge "Zipalign: Avoid unnecessary padding" 2021-09-15 00:34:44 +00:00
Guang Zhu
e3d9c8502c Merge "update build rules to use /data/local/tests/unrestricted" am: f934e69049
Original change: https://android-review.googlesource.com/c/platform/build/+/1826138

Change-Id: I2dad026ec178ef4aac84edfcb909ceecb9e4935a
2021-09-15 00:23:31 +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
69dd474c35 Merge "Make the script python3." am: fe9efa5a61
Original change: https://android-review.googlesource.com/c/platform/build/+/1822532

Change-Id: Ica119080b4482f30d74cc1402cfd8d7fb39fa10c
2021-09-14 21:25:55 +00:00
Christopher Ferris
fe9efa5a61 Merge "Make the script python3." 2021-09-14 21:03:01 +00:00
Greg Kaiser
497e97a6d6 Merge "Revert "Rebuild vendor images in sign_target_files_apks with vendor otatools."" am: d9c6d5fc91
Original change: https://android-review.googlesource.com/c/platform/build/+/1826618

Change-Id: Iba7b9100c452202ddcf4529f6639568d44deff9f
2021-09-14 19:54:26 +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
b4814708b5 Merge "Zipalign: Remove unused variables" am: c13f049bcd
Original change: https://android-review.googlesource.com/c/platform/build/+/1825936

Change-Id: I347fe33edae5cd5a055119c70532a3e78ebc12ff
2021-09-14 17:16:43 +00:00
Treehugger Robot
c13f049bcd Merge "Zipalign: Remove unused variables" 2021-09-14 16:52:29 +00:00
Rob Seymour
c3fc0a06e3 Merge "Add fake host snapshot support" am: ab5492c72c
Original change: https://android-review.googlesource.com/c/platform/build/+/1792747

Change-Id: I62a43d37ee667c0c899dd9647fa0117b30f075d2
2021-09-14 15:04:01 +00:00
Rob Seymour
ab5492c72c Merge "Add fake host snapshot support" 2021-09-14 14:47:03 +00:00
Treehugger Robot
523cf4e812 Merge "Skip building boot-(test-harness|debug).img if not needed" am: a83a19d41e
Original change: https://android-review.googlesource.com/c/platform/build/+/1823019

Change-Id: I5f65a446198f3d5e6e5218df88473179a73b5f90
2021-09-14 09:43:51 +00:00
Treehugger Robot
a83a19d41e Merge "Skip building boot-(test-harness|debug).img if not needed" 2021-09-14 09:09:56 +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
76e3a8419c Merge "Rebuild vendor images in sign_target_files_apks with vendor otatools." am: 97e0c2831d
Original change: https://android-review.googlesource.com/c/platform/build/+/1782407

Change-Id: I43f9b2dca35442b8afef80fa84e36db811364453
2021-09-13 20:33:30 +00:00
Daniel Norman
97e0c2831d Merge "Rebuild vendor images in sign_target_files_apks with vendor otatools." 2021-09-13 20:12:11 +00: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
Yifan Hong
b74a004520 Merge "Avoid repeated building of erofs image" am: 1ab1c2ff96
Original change: https://android-review.googlesource.com/c/platform/build/+/1821096

Change-Id: Ibe47f2192262300122e8d6b767a2879af3d317ed
2021-09-11 00:19:15 +00:00
Yifan Hong
1ab1c2ff96 Merge "Avoid repeated building of erofs image" 2021-09-11 00:05:45 +00:00
Bob Badour
98fd5d25d7 Merge "Re-call BUILD_NOTICE_FILE for modules that add deps" am: 08472a6b4b
Original change: https://android-review.googlesource.com/c/platform/build/+/1817318

Change-Id: I0b3e806c6ef03de8e8fa5ae4120d3194f9f8b1f9
2021-09-10 17:22:16 +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
5353d0f3b9 Merge "Fix arguments passed to llvm-readobj" am: c48a9fb19c
Original change: https://android-review.googlesource.com/c/platform/build/+/1823794

Change-Id: I93dcd361b4139b02679d077a70b078bc08713e8a
2021-09-10 15:28:13 +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
8e6eae32d6 Merge "Add option to override minor version" am: 48662b25fc
Original change: https://android-review.googlesource.com/c/platform/build/+/1822181

Change-Id: Ifc46f3fba3277d525845d6bab3c4e13cc8f313c2
2021-09-10 06:00:42 +00:00
Tianjie Xu
48662b25fc Merge "Add option to override minor version" 2021-09-10 05:48:01 +00:00
Bill Yi
ddb639b84d [automerger skipped] Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE" am: 7039269418 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/build/+/1822787

Change-Id: Ie40b131dde917f11289f347d4eaaefd715418403
2021-09-09 21:39:33 +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
a10ffc2c5f [automerger skipped] Merge "Add Radio AIDL to VNDK" am: 355f345956 -s ours
am skip reason: Merged-In I95d089fb23c4a3baa7f7a6c1435099f34a1af5a3 with SHA-1 c68e0808ae is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1816597

Change-Id: Id16d4bba9c85f8d60250a3464af00e0cdc69b373
2021-09-09 05:34:09 +00:00
Sarah Chin
355f345956 Merge "Add Radio AIDL to VNDK" 2021-09-09 05:21:43 +00:00
Sarah Chin
d0a58e8d6e Merge "Add Radio AIDL to VNDK" into stage-aosp-master 2021-09-09 04:25:24 +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
7700de1d52 Merge "Don't sparse right-sized ext4 and erofs images." am: c01c341b6a
Original change: https://android-review.googlesource.com/c/platform/build/+/1811336

Change-Id: Ia11cb981f28bec05ba4019a3a05126be5059697e
2021-09-08 22:40:41 +00:00
David Anderson
c01c341b6a Merge "Don't sparse right-sized ext4 and erofs images." 2021-09-08 22:25:37 +00:00