Commit Graph

27544 Commits

Author SHA1 Message Date
Treehugger Robot
ee05ac0d49 Merge "Separate output from diagnostics in Starlark product configuration." am: 335f594e30
Original change: https://android-review.googlesource.com/c/platform/build/+/1836493

Change-Id: I70ae0619f2f5d6da86a1aa4dc6080643b6d950a8
2021-09-24 18:06:07 +00:00
Sasha Smundak
e8652d4cd1 Separate output from diagnostics in Starlark product configuration.
Some of the product configuration makefiles use `info` and `warning` Make's
builtins for diagnostics. As running Starlark configuration generates the makefile
as its output, this diagnostics has to go elsewhere. Implement `rblf_log` as
the functional equivalent of `print` that writes to stderr instead of stdout
and use it to implement `info` and `warning` counterparts.

Fixes: 201073196
Test: manual
Change-Id: Ib4d9c10566f9b20310fbee41eda67f0a621b0a84
2021-09-24 08:54:29 -07:00
Yi-Yo Chiang
2a4b948f44 Merge "Reland: Add PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT" am: ad48e9cb87
Original change: https://android-review.googlesource.com/c/platform/build/+/1834754

Change-Id: I3318b0a47b0c5c1181b3dbdf676bcadf27781e6a
2021-09-24 03:25:31 +00:00
Yi-Yo Chiang
ad48e9cb87 Merge "Reland: Add PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT" 2021-09-24 03:10:34 +00:00
Colin Cross
59737777dd Merge "Remove MAINDEXCLASSES" am: e919f2b8b1
Original change: https://android-review.googlesource.com/c/platform/build/+/1833628

Change-Id: I95d200e87eeb41f6eb686ab9913b748ae340a68d
2021-09-23 16:33:21 +00:00
Colin Cross
e919f2b8b1 Merge "Remove MAINDEXCLASSES" 2021-09-23 16:19:18 +00:00
Yi-Yo Chiang
f63bd5d4ba Reland: 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: I8c62a3cea026bd26b1994092a14238d22ba1e2df
2021-09-23 14:26:04 +00:00
Santiago Seifert
be4d8a5e8f Merge "Revert "Add PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT"" am: 1fcf4894d0
Original change: https://android-review.googlesource.com/c/platform/build/+/1834616

Change-Id: Ib6b8d6ce6a34a8e26b914344fe2c4b3e711ba177
2021-09-23 13:33:47 +00:00
Santiago Seifert
1fcf4894d0 Merge "Revert "Add PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT"" 2021-09-23 13:25:55 +00:00
Ulyana Trafimovich
cbf1ed03f0 Merge "Move copy rule for system server jars from dexpreopt_gen to makefiles." am: adcdb18257
Original change: https://android-review.googlesource.com/c/platform/build/+/1832297

Change-Id: If5e1a28a37cf666408f8811c1fb8f187fc3f5e23
2021-09-23 13:23:54 +00:00
Ulyana Trafimovich
adcdb18257 Merge "Move copy rule for system server jars from dexpreopt_gen to makefiles." 2021-09-23 13:20:49 +00:00
Santiago Seifert
08fbdf8c75 Revert "Add PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT"
Revert "Add system_ext_userdebug_plat_sepolicy.cil for GSI"

Revert submission 1824717-gsi_debug_policy

Reason for revert: Breaks the build (see b/200933187).
Reverted Changes:
I37ef02628:Add a copy of debug policy to GSI system image
I9c3dad8bb:Add PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT
I43adc6ada:Add system_ext_userdebug_plat_sepolicy.cil for GSI...
I4d6235c73:Add /system_ext/etc/selinux/ to the debug policy s...
Bug: 200933187
Change-Id: I4252793fbee1b83e3db26f944ac0be6581fa773f
2021-09-23 13:13:40 +00:00
Ulya Trafimovich
44f762a766 Move copy rule for system server jars from dexpreopt_gen to makefiles.
This is necessary in order to expose the copy rule to Ninja. Otherwise
Ninja has a build rule that depends on the copied jar (namely, dexpreopt
commands for all subsequent system server jars that have the current one
in class loader context), but no rule that creates it, so Ninja fails
with a "no rule to make ..." error.

The change only affects system server ed in Android.mk

Previously the problem existed, but was hidden by the fact that the only
system server jar defined in Android.mk was the last one on the list, so
no other jar depended on it. Now that updatable apex jars are also
dexpreopted (https://r.android.com/1828115) the problem was uncovered.

Also the patch removes obsolete logic that disable dexpreopt for
PRODUCT_APEX_SYSTEM_SERVER_JARS; these jars are now preopted (but they
are all defined in Android.bp anyway, so no functional change here).

Bug: 200297762
Test: lunch bertha_x86_64-userdebug && m
Change-Id: I67c6d69f45ca3495f62994b5329f9e424dda4e65
2021-09-23 12:10:04 +01:00
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
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
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
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
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
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
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
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
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
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
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