Commit graph

72445 commits

Author SHA1 Message Date
Treehugger Robot
59b0252656 [automerger skipped] Merge "[IRadioConfig] Adding to VNDK" am: 03e14fc4c0 -s ours
am skip reason: Merged-In Ifdbac8646bd20849fe4111f75f411426c5a23248 with SHA-1 1c6dad568d is already in history

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

Change-Id: Id42c1a951b389be57cae2e137a835fbc2f8185c7
2021-09-22 02:01:06 +00:00
Treehugger Robot
03e14fc4c0 Merge "[IRadioConfig] Adding to VNDK" 2021-09-22 01:49:23 +00:00
Lev Rumyantsev
b32e1479ef Make native.bridge property overridable
When a device uses native bridge, it may be included in the system
image, so overriding by vendor/build.prop is not an option.
Example of overriding can be seen here: ag/15881132

Test: build cf_x86_64_phone-userdebug with native-bridge and launch, observe
1. ro.dalvik.vm.native.bridge=native_bridge.so moved from
vendor/build.prop to system/build.prop
2. the prop is correctly set at runtime
3. translated apps work
Bug: 197153442

Change-Id: I6cd566dd4e0fac181e309cb7f282d086de09075b
2021-09-21 15:01:08 -07:00
Ivan Lozano
b74088f8b0 rust: Add EXTRA_CONFIGS to rust test template
Bug: 200602232
Test: Extra configs are in generated config
Change-Id: I4abd822f970747a176a746c00d0fa5246441f331
2021-09-21 12:31:22 -04:00
Serik Beketayev
1c6dad568d [IRadioConfig] Adding to VNDK
Generated IRadioConfig.aidl and dependencies using tool
hidl2aidl.

Bug: 198331805
Test: m android.hardware.radio.config
Change-Id: Ifdbac8646bd20849fe4111f75f411426c5a23248
Merged-In: Ifdbac8646bd20849fe4111f75f411426c5a23248
2021-09-21 04:52:59 +00:00
Serik Beketayev
e0707317d9 [IRadioConfig] Adding to VNDK
Generated IRadioConfig.aidl and dependencies using tool
hidl2aidl.

Bug: 198331805
Test: m android.hardware.radio.config
Change-Id: Ifdbac8646bd20849fe4111f75f411426c5a23248
Merged-In: Ifdbac8646bd20849fe4111f75f411426c5a23248
2021-09-20 17:32:25 -07:00
Alexander Smundak
64f39fec22 Merge "Make global config depend on version defaults." am: b9306ac477
Original change: https://android-review.googlesource.com/c/platform/build/+/1822533

Change-Id: I6ec80bf9f029eb7f5dca2d25118d030cad386c3b
2021-09-20 17:13:56 +00:00
Sasha Smundak
3a1764f8be Add is-board-platform2/is-board-platform-in-list2
This is the first step to get rid of the set of identical macros defined
in utils.mk files in multiple device/google/xxxx directories. The macros
is-board-platform/is-board-platform-in-list will be eventuall replaced
with the new ones.

Bug: 190051051
Test: treehugger
Change-Id: I28017df86dbd899be38f882dd5496c894986d8db
2021-09-20 09:57:36 -07:00
Alexander Smundak
b9306ac477 Merge "Make global config depend on version defaults." 2021-09-20 16:56:10 +00:00
Jingwen Chen
6492201d28 Merge "Remove module_name_to_label short circuit from m." am: 4528968faf
Original change: https://android-review.googlesource.com/c/platform/build/+/1829694

Change-Id: I0e7254c18451a656531049390b3a0ee83ce7d81f
2021-09-20 08:43:59 +00:00
Jingwen Chen
4528968faf Merge "Remove module_name_to_label short circuit from m." 2021-09-20 08:27:34 +00:00
Yuntao Xu
272c630c5f Merge "move cts-test-coverage" am: 68be5b858c
Original change: https://android-review.googlesource.com/c/platform/build/+/1828792

Change-Id: I99cf14fe6e7795ab5afbe6c29ce55e608352c64a
2021-09-17 23:27:11 +00:00
Yuntao Xu
68be5b858c Merge "move cts-test-coverage" 2021-09-17 23:13:58 +00:00
Sasha Smundak
b2220c2990 Make global config depend on version defaults.
Starlark-based product configuration can now share version settings
with makefile product config (mk2rbc converts version_defaults.mk into
version_defaults.rbc which is consumed by runtime initialization).

Bug: 198995713
Test: rbcrun build/make/tests/run.rbc
Change-Id: I1d3ddfed3b15d346b3e10714a195a9f0a3a55a56
2021-09-17 11:00:29 -07:00
Yi-Yo Chiang
0a468fe904 Add PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT
If this option is set, then an additional copy of the debug policy can
be installed to the GSI, and the init-second-stage of GSI could load
debug policy from GSI /system_ext when debug-ramdisk is used.

Bug: 188067818
Test: Flash RQ2A.201207.001 bramble-user with debug ramdisk & flash
  gsi_arm64-user from master, device can boot and `adb root` works
Change-Id: I9c3dad8bb6c5fa88b16762193446dc7e54f326c8
2021-09-17 20:53:56 +08:00
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
Treehugger Robot
d656f50618 Merge "Stop disting monolithic SDK for Mac SDK builds" am: 1646ba0814
Original change: https://android-review.googlesource.com/c/platform/build/+/1829032

Change-Id: I2bda18219770a634add3716a3de215b8fc41cba6
2021-09-17 06:08:53 +00:00
Treehugger Robot
1646ba0814 Merge "Stop disting monolithic SDK for Mac SDK builds" 2021-09-17 05:55:47 +00:00
Dan Willemsen
616e7fd9b6 Stop disting monolithic SDK for Mac SDK builds
The Mac SDK build is being reduced to just the build-tools and
platform-tools packages. I'm still working on refactoring those builds
not to require the monolithic SDK to be built first, but we can at least
stop distributing it (and other related files) now.

Most of these checks can likely go away once the build refactor is
complete, since we'll be able to move away from the `sdk` target to
something more specific. Right now there's a lot of logic around sdk
being in MAKECMDGOALS that I don't want to unravel with the current
build logic.

Bug: 187222815
Change-Id: I1f711ce063170e41078ad4a125bcd77340a1746c
2021-09-16 14:54:38 -07:00
David Anderson
cc21670121 Merge "Avoid too much reserved_size for erofs image" am: dfc9d7912f
Original change: https://android-review.googlesource.com/c/platform/build/+/1821097

Change-Id: I9111ffc26870f62714d869fdf946c0a42f3c6232
2021-09-16 19:48:20 +00:00
David Anderson
dfc9d7912f Merge "Avoid too much reserved_size for erofs image" 2021-09-16 19:36:29 +00:00
Treehugger Robot
b476242ced [automerger skipped] Merge "Move the stable code from version_defaults.mk to version_util.mk." am: 258fca9a8f -s ours
am skip reason: Merged-In I4798fb69c639e6d52d275a5b793fa0c8ba876202 with SHA-1 cda1f3768f is already in history

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

Change-Id: Ia406d5b1f8d1529c9af066499a4d15d118e410b6
2021-09-16 19:23:57 +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
Yuntao Xu
2bf33c458f move cts-test-coverage
Moved cts-test-coverage from cts/build/ to build/make/core/tasks/cts.mk.

Bug: 190635892
Test: m cts-test-coverage
Test: TreeHugger
Change-Id: I161adebc356b693329dfe48661476840c32beaa6
2021-09-16 11:55:08 -07:00
Daniel Norman
4495b649ef Merge "Build vendor images first when rebuilding with vendor_otatools." am: a529e0fd2e
Original change: https://android-review.googlesource.com/c/platform/build/+/1826615

Change-Id: I71cca612bf0925be76fd7d4a91d652af12be4ca2
2021-09-16 17:44:49 +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
34f50fefad Merge "Add android-cts-verifier.zip" am: a1b1f638d3
Original change: https://android-review.googlesource.com/c/platform/build/+/1820673

Change-Id: Ib46b9e711faf8f663e1ba26a2e2ccf8d13b07f57
2021-09-16 17:22:44 +00:00
Yuntao Xu
a1b1f638d3 Merge "Add android-cts-verifier.zip" 2021-09-16 17:06:16 +00:00
Treehugger Robot
36ebb662c3 Merge "Clean up gki-5.4 related rules in GSI" am: 389170f9ec
Original change: https://android-review.googlesource.com/c/platform/build/+/1825192

Change-Id: I6db74dc855b814c00ee8cb90628b673633ae3d44
2021-09-16 09:38:52 +00:00
Treehugger Robot
389170f9ec Merge "Clean up gki-5.4 related rules in GSI" 2021-09-16 09:22:59 +00:00
TreeHugger Robot
acdfa0f404 Merge "Move the stable code from version_defaults.mk to version_util.mk." into stage-aosp-master 2021-09-16 01:49:28 +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
Sasha Smundak
cda1f3768f 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
Change-Id: I4798fb69c639e6d52d275a5b793fa0c8ba876202
Merged-In: I4798fb69c639e6d52d275a5b793fa0c8ba876202
2021-09-15 16:12:05 -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
db3ab0fe7a [automerger skipped] Merge "Add the cts-platform-version check" am: 3d4c52d6ed -s ours
am skip reason: Merged-In I613ac5b5014dbf4e6202e1dbd1b6a92359817cf2 with SHA-1 9c2fea67e9 is already in history

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

Change-Id: I42ae137d52e3d81133e68eed36bb1d72f8d4b3fa
2021-09-15 21:44:52 +00:00
Yuntao Xu
3d4c52d6ed Merge "Add the cts-platform-version check" 2021-09-15 21:28:54 +00:00
Yuntao Xu
4800938d69 Merge "Revert^2 "Add the cts-platform-version check"" into stage-aosp-master 2021-09-15 19:17:21 +00:00
Yuntao Xu
0f4f449343 Revert^2 "Add the cts-platform-version check"
712cf0a586

Change-Id: I5339a63a672ee2f09364bc8d2aee27d55c9305a6
Merged-In: I613ac5b5014dbf4e6202e1dbd1b6a92359817cf2
2021-09-15 17:31:40 +00:00
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
Inseob Kim
d416dae347 Add more sepolicy variables to soong_config
Bug: 33691272
Test: m selinux_policy on sc-dev
Change-Id: I3fd9994d3b7ec2204b8d1be01381f590535f2278
2021-09-15 03:04:14 +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