Commit Graph

28743 Commits

Author SHA1 Message Date
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
Treehugger Robot
2f8577683c Merge "Revert "update build rules to use /data/local/tests/unrestricted"" am: 9d57bf30e5 am: ae5c1cf357
Original change: https://android-review.googlesource.com/c/platform/build/+/1832959

Change-Id: I6bee884b3fcd0efdde9d1c0953117e029fa3a4df
2021-09-22 07:01:11 +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
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
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
Alexander Smundak
ffaa210dca Merge "Make global config depend on version defaults." am: b9306ac477 am: 64f39fec22
Original change: https://android-review.googlesource.com/c/platform/build/+/1822533

Change-Id: I19899584b5da0acafe9b1cb23157ba5a94b9b5a7
2021-09-20 17:31:20 +00: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
Yuntao Xu
eb83f1f0d6 Merge "move cts-test-coverage" am: 68be5b858c am: 272c630c5f
Original change: https://android-review.googlesource.com/c/platform/build/+/1828792

Change-Id: I0ab460568ac52dde7400f71d791fbec7afba71ea
2021-09-17 23:41:57 +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
Android Build Coastguard Worker
c3fa5c5a55 Version bump to SP1A.211105.002 [core/build_id.mk]
Change-Id: Id38a1a391cbdfc858e9ef08a08f5230bad5777e4
2021-09-17 19:22:08 +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
Treehugger Robot
b939ae8c2a Merge "Stop disting monolithic SDK for Mac SDK builds" am: 1646ba0814 am: d656f50618
Original change: https://android-review.googlesource.com/c/platform/build/+/1829032

Change-Id: I5eed84b57b03d81777e52ed116118820718b7383
2021-09-17 06:29: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
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
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
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
Presubmit Automerger Backend
541828d6f0 [conflict] [DO NOT MERGE] 2p: 0449bb97fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15821927

Bug: 199784479
Change-Id: I4ee0a8240ace16d1a85b637b3d70568bae289693
2021-09-16 13:20:30 +00:00
Paul Scovanner
0449bb97fa [DO NOT MERGE]
Update Security String to 2021-11-05

Bug: 199784479
Change-Id: I7e03900c5d853b32f8fbd75cb591063ba4a27450
Merged-In: I7e03900c5d853b32f8fbd75cb591063ba4a27450
2021-09-16 11:39:07 +00:00
Treehugger Robot
848ca42fc6 Merge "Ensure RBE_CXX_POOL and RBE_JAVA_POOL variables work as expected" am: dcc78a8f0a am: 46b9fe39ac
Original change: https://android-review.googlesource.com/c/platform/build/+/1826981

Change-Id: Ibf79227ac4096795cd18c29d5635a42293e24529
2021-09-16 06:55:41 +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
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
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
Guang Zhu
bcb487b2fa Merge "update build rules to use /data/local/tests/unrestricted" am: f934e69049 am: e3d9c8502c
Original change: https://android-review.googlesource.com/c/platform/build/+/1826138

Change-Id: I8a18bfb1e2e0262b8cd7ffa41115ac56f10c7a7e
2021-09-15 00:35:01 +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
Android Build Coastguard Worker
c9905e474c Make change and version bump to SP1A.211105.001
Change-Id: I324a918524f3ca58caa599c8f1c120b32403fae0
2021-09-15 00:14:56 +00:00
Paul Scovanner
65c38e6610 Update Security String to 2021-11-05
Bug: 199784479
Change-Id: I7e03900c5d853b32f8fbd75cb591063ba4a27450
(cherry picked from commit 34d60902ee8cc9ed4a1b1ae059c6a16091351d39)
2021-09-15 00:10:01 +00:00
TreeHugger Robot
2c3c8d5ab1 Merge "Move the stable code from version_defaults.mk to version_util.mk." into sc-dev-plus-aosp 2021-09-14 21:30:59 +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
Sasha Smundak
1d7923e7d8 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-14 08:53:10 -07:00
Rob Seymour
08b1ec7e11 Merge "Add fake host snapshot support" am: ab5492c72c am: c3fc0a06e3
Original change: https://android-review.googlesource.com/c/platform/build/+/1792747

Change-Id: Ie413d857b5b2b6601700e2145132a369e062d19e
2021-09-14 15:28:48 +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
5eb5d66091 Merge "Skip building boot-(test-harness|debug).img if not needed" am: a83a19d41e am: 523cf4e812
Original change: https://android-review.googlesource.com/c/platform/build/+/1823019

Change-Id: I0c6c64f660872576c7b6de69e57866eaec519aa5
2021-09-14 10:26:17 +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