Commit graph

72464 commits

Author SHA1 Message Date
Yi-Yo Chiang
3c1e027070 Merge "Add PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT" am: 8d0e824a78
Original change: https://android-review.googlesource.com/c/platform/build/+/1825193

Change-Id: I0dae07dea19baeba60d49b4ed1816fb8430be597
2021-09-23 10:15:17 +00:00
Yi-Yo Chiang
8d0e824a78 Merge "Add PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT" 2021-09-23 10:07:10 +00:00
Sarah Chin
3628138f4c Add IRadio modules to VNDK
Test: build
Bug: 198331451
Change-Id: Ifdf60903e715cae26a06501aeb3c578f94d207fd
Merged-In: Ifdf60903e715cae26a06501aeb3c578f94d207fd
2021-09-23 03:55:06 +00:00
Sarah Chin
1e620711d7 Merge "Add IRadio modules to VNDK" into stage-aosp-master 2021-09-23 02:58:32 +00:00
David Anderson
40a821f600 Allow changing the EROFS compressor.
This adds BOARD_EROFS_COMPRESSOR to change the compression algorithm
globally, and BOARD_{x}IMAGE_EROFS_COMPRESSOR to change it for
individual partitions.

Bug: N/A
Test: manual test
Change-Id: I2ef831558242a4070ee96269140c33b66c689351
2021-09-22 18:04:27 -07:00
David Anderson
c44602819e Merge "Refactor generate-image-prop-dictionary." am: 4cf8170fed
Original change: https://android-review.googlesource.com/c/platform/build/+/1832960

Change-Id: I002cc8fa262f15cdfb638d4bfd17fd7ff1ae5888
2021-09-23 00:42:32 +00:00
David Anderson
4cf8170fed Merge "Refactor generate-image-prop-dictionary." 2021-09-23 00:31:19 +00:00
Treehugger Robot
3aac1ab175 Merge "Add is-board-platform2/is-board-platform-in-list2" am: 562e71bb7e
Original change: https://android-review.googlesource.com/c/platform/build/+/1810519

Change-Id: Ib08d954173122209a680ced3dd1c0841d5b6b7b9
2021-09-22 23:22:32 +00:00
Treehugger Robot
562e71bb7e Merge "Add is-board-platform2/is-board-platform-in-list2" 2021-09-22 23:09:11 +00:00
Colin Cross
5a3729b2ba Remove MAINDEXCLASSES
The last user of MAINDEXCLASSES was removed in
Ia88660550c3e57749b8ccb154e97c31aaf2fcf3a.

Test: m checkbuild
Change-Id: I35d9e7d9ff4ac2c07716db59c900b8c3f2cb352e
2021-09-22 15:53:39 -07:00
David Anderson
707e6f5ac8 Refactor generate-image-prop-dictionary.
It's really error prone to add new partitions or image flags given the
amount of code duplication here. Since most images have (or should have)
roughly the same flags, this factors the work out into a helper
function.

Bug: N/A
Test: m, m otapackage
Change-Id: If1a22b9d7b5cf028ba52608322c4383792dae6b9
2021-09-22 14:14:44 -07:00
Romain Jobredeaux
2a7844cfdf Merge "Create Bazel BUILD targets and Bazel rule for logtag file conversion." am: 73bddf4c72
Original change: https://android-review.googlesource.com/c/platform/build/+/1822073

Change-Id: Ie4aaef4d829cf67ed3608cb6eb198cf7217fc9a7
2021-09-22 17:48:17 +00:00
Romain Jobredeaux
73bddf4c72 Merge "Create Bazel BUILD targets and Bazel rule for logtag file conversion." 2021-09-22 17:28:31 +00:00
Treehugger Robot
ae5c1cf357 Merge "Revert "update build rules to use /data/local/tests/unrestricted"" am: 9d57bf30e5
Original change: https://android-review.googlesource.com/c/platform/build/+/1832959

Change-Id: I8d2436e24abdff9dbbeb23db34a420246c69f3b1
2021-09-22 06:45:42 +00:00
Treehugger Robot
9d57bf30e5 Merge "Revert "update build rules to use /data/local/tests/unrestricted"" 2021-09-22 06:33:44 +00:00
Sarah Chin
519c2211d5 Add IRadio modules to VNDK
Test: build
Bug: 198331451
Change-Id: Ifdf60903e715cae26a06501aeb3c578f94d207fd
2021-09-21 23:33:20 -07:00
Guang Zhu
97278c1828 Revert "update build rules to use /data/local/tests/unrestricted"
Revert "update build rules to use /data/local/tests/unrestricted"

Revert submission 1826231-native-test-path

Bug: 199996863

Reason for revert: b/199996863
Reverted Changes:
Ic106011a7:update build rules to use /data/local/tests/unrest...
Id727355ec:update build rules to use /data/local/tests/unrest...

Change-Id: I18301ab3effacd43ff2f136bba9d3244b497a54b
2021-09-22 04:20:05 +00:00
Treehugger Robot
2ab762b6f7 Merge "Make native.bridge property overridable" am: 3c63667abb
Original change: https://android-review.googlesource.com/c/platform/build/+/1832764

Change-Id: I68933ad960937b3d2d6f6f9d804169cbbc5e1063
2021-09-22 02:58:01 +00:00
Treehugger Robot
3c63667abb Merge "Make native.bridge property overridable" 2021-09-22 02:45:11 +00:00
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