Commit Graph

28743 Commits

Author SHA1 Message Date
Cole Faust
ee8cd58a85 Show mk2rbc warnings when they occur
There was a missing $ for variable expansion,
and $(info) does not seem to show up in soong output,
but $(warning) does.

Fixes: 201431870
Test: After introducing a problem in mk2rbc: m RBC_PRODUCT_CONFIG=1 nothing
Change-Id: Ife7786d27a7315e873ea125ca361e684ffb79e1e
2021-09-28 11:30:03 -07:00
Treehugger Robot
d47b774373 Merge "Add more sepolicy variables to soong_config" am: 2c8d7798cd am: 687c66b021
Original change: https://android-review.googlesource.com/c/platform/build/+/1826139

Change-Id: I8b912cdc08f8f5dd60493ec27aeedcbdd3761921
2021-09-27 11:36:04 +00:00
Treehugger Robot
687c66b021 Merge "Add more sepolicy variables to soong_config" am: 2c8d7798cd
Original change: https://android-review.googlesource.com/c/platform/build/+/1826139

Change-Id: Ia51d77efa4576f5feadd60f1d927c4990e462985
2021-09-27 11:20:39 +00:00
Treehugger Robot
2c8d7798cd Merge "Add more sepolicy variables to soong_config" 2021-09-27 11:05:19 +00:00
Treehugger Robot
d8c1450d54 Merge "Renames boot-debug-*.img in GSI targets" am: b7aced88d6 am: d995c9e246
Original change: https://android-review.googlesource.com/c/platform/build/+/1833559

Change-Id: I86df86c895440f1066fe5ab2bb055fd97d3dc85b
2021-09-25 04:04:37 +00:00
Treehugger Robot
d995c9e246 Merge "Renames boot-debug-*.img in GSI targets" am: b7aced88d6
Original change: https://android-review.googlesource.com/c/platform/build/+/1833559

Change-Id: I77024efd9f0281e40397bdebfab4160997bb50dc
2021-09-25 03:50:32 +00:00
Treehugger Robot
b7aced88d6 Merge "Renames boot-debug-*.img in GSI targets" 2021-09-25 03:33:40 +00:00
Treehugger Robot
e3eb897949 Merge "Return find_and_copy result in sorted order." am: 128bfc440e am: 73c444b40e
Original change: https://android-review.googlesource.com/c/platform/build/+/1836494

Change-Id: Ic40097a497db49cb3566b67bb69b93dc52033fca
2021-09-25 02:54:43 +00:00
Treehugger Robot
73c444b40e Merge "Return find_and_copy result in sorted order." am: 128bfc440e
Original change: https://android-review.googlesource.com/c/platform/build/+/1836494

Change-Id: I44bf1da6108f9a0f4974b73ab252fd1d2e2b23b8
2021-09-25 02:44:50 +00:00
Treehugger Robot
128bfc440e Merge "Return find_and_copy result in sorted order." 2021-09-25 02:27:35 +00:00
Colin Cross
f4017412e2 Support per-testcase directories in all test suites
There are cases where two modules try to install the same test data
into CTS, which results in collisions when CTS puts the data for all
tests in the same directory.  Add a flag that allows enabling a
per-testcase directory for an individual test for all test suites.

Bug: 193168159
Test: cts-tradefed run commandAndExit CtsBionicTestCases
Change-Id: I4bfaaedfe0e6b8df9c75125b3e2762a4f0d5b395
2021-09-24 16:58:03 -07:00
David Anderson
441fd282ca Merge "Allow changing the EROFS compressor." am: 684e74ae15 am: 6d3e5ac6e7
Original change: https://android-review.googlesource.com/c/platform/build/+/1833630

Change-Id: I6be84d01b565395e1cb37181399ce0c27036bf19
2021-09-24 19:43:34 +00:00
David Anderson
6d3e5ac6e7 Merge "Allow changing the EROFS compressor." am: 684e74ae15
Original change: https://android-review.googlesource.com/c/platform/build/+/1833630

Change-Id: I75fc2f11707825da9acb26138666dc9de77553c2
2021-09-24 19:26:10 +00:00
David Anderson
684e74ae15 Merge "Allow changing the EROFS compressor." 2021-09-24 19:12:53 +00:00
Ivan Lozano
d3ad2b1dad Merge "rust: Add EXTRA_CONFIGS to rust test template" am: bdf229ce99 am: 6af95e337e
Original change: https://android-review.googlesource.com/c/platform/build/+/1832615

Change-Id: I4da271befdb4683d00231e0df4b7ab9465993c32
2021-09-24 19:05:47 +00:00
Ivan Lozano
6af95e337e Merge "rust: Add EXTRA_CONFIGS to rust test template" am: bdf229ce99
Original change: https://android-review.googlesource.com/c/platform/build/+/1832615

Change-Id: I8ca2d4a7f60e8cbfc550f6e037d68df66da1a8aa
2021-09-24 18:54:05 +00:00
Ivan Lozano
bdf229ce99 Merge "rust: Add EXTRA_CONFIGS to rust test template" 2021-09-24 18:39:47 +00:00
Treehugger Robot
54676e9237 Merge "Separate output from diagnostics in Starlark product configuration." am: 335f594e30 am: ee05ac0d49
Original change: https://android-review.googlesource.com/c/platform/build/+/1836493

Change-Id: I38762a26397eabc44cf05218f8f827b1a13fc521
2021-09-24 18:20:36 +00:00
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
Colin Cross
177cbf600d Update build_id.mk and version_defaults.mk for SC QPR1
Set BUILD_ID to "SC_QPR1", and update DEFAULT_PLATFORM_VERSION to
"SQ1A".

Bug: 201081191
Test: m checkbuild
Change-Id: I1ed59bef262be000bb8c77ed83bb549164a1c39b
Merged-In: I39a82c8ac3fd0b43bad06ec47b85aaeda6ef5cb4
Merged-In: Ie8bed4cefed83db5324ad98b6e70cb69b3f82780
2021-09-24 10:34:43 -07:00
Sasha Smundak
3dc68f1750 Return find_and_copy result in sorted order.
To facilitate regression testing.

Fixes: 200679083
Test: manual
Change-Id: I9c5ee84a26cecd1c1d770b773539a77f8115fe48
2021-09-24 08:54:43 -07: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
87e59f48fe Merge "Reland: Add PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT" am: ad48e9cb87 am: 2a4b948f44
Original change: https://android-review.googlesource.com/c/platform/build/+/1834754

Change-Id: Id93b39920defb46551eb6d0798ff7ed96832b859
2021-09-24 03:44:33 +00: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
349164589f Merge "Remove MAINDEXCLASSES" am: e919f2b8b1 am: 59737777dd
Original change: https://android-review.googlesource.com/c/platform/build/+/1833628

Change-Id: Ida92bc8dff888d35d5ff2dec51c7422e02ec6f66
2021-09-23 16:47:23 +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
Bowgo Tsai
a2a5db4466 Renames boot-debug-*.img in GSI targets
Those boot-debug-*.img is used with `repack_bootimg` for a
vendor_boot-debug.img in VTS setup. It is not for GKI boot.img
release.

  https://source.android.com/compatibility/vts/vts-on-gsi#repacking

Renames boot-debug-*.img to boot-with-debug-ramdisk-*.img to
avoid confusion with the official GKI boot.img release.

Bug: 200878300
Test: `lunch gsi_arm64-user` then `make bootimage_debug`
Change-Id: Ia1f6ba847d5b7409fb7a8534432484d2aa972494
2021-09-23 22:19:52 +08:00
Santiago Seifert
bd69758dd9 Merge "Revert "Add PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT"" am: 1fcf4894d0 am: be4d8a5e8f
Original change: https://android-review.googlesource.com/c/platform/build/+/1834616

Change-Id: I1db995ec9eee08225f9b11ce1d674d8f1705002d
2021-09-23 13:37:54 +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
Ulyana Trafimovich
3bfe100c42 Merge "Move copy rule for system server jars from dexpreopt_gen to makefiles." am: adcdb18257 am: cbf1ed03f0
Original change: https://android-review.googlesource.com/c/platform/build/+/1832297

Change-Id: Ie019456e048e1c755d52a527b8f91e0cea39055f
2021-09-23 13:25:59 +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
05c72306f7 Merge "Add PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT" am: 8d0e824a78 am: 3c1e027070
Original change: https://android-review.googlesource.com/c/platform/build/+/1825193

Change-Id: I2c638142eb1a223b12e1825efd133b443ae9f2f2
2021-09-23 10:28:28 +00: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
Android Build Coastguard Worker
659e044b98 Version bump to SP1A.211105.003 [core/build_id.mk]
Change-Id: If3c90060e117372b9590550813fafb7b1d9dd4b8
2021-09-23 01:29:28 +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
87482b46eb Merge "Refactor generate-image-prop-dictionary." am: 4cf8170fed am: c44602819e
Original change: https://android-review.googlesource.com/c/platform/build/+/1832960

Change-Id: I5c6b2e51fdeecd2493e8ad4f3519ca1724ef5b6d
2021-09-23 00:55:28 +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
34af8ed377 Merge "Add is-board-platform2/is-board-platform-in-list2" am: 562e71bb7e am: 3aac1ab175
Original change: https://android-review.googlesource.com/c/platform/build/+/1810519

Change-Id: Ie90bf95a8ef5608cbd1ffc2f5d63b050d0802276
2021-09-22 23:37:29 +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