Commit Graph

72721 Commits

Author SHA1 Message Date
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
Ivan Lozano
65b1e889b1 Merge "rust: Add EXTRA_CONFIGS to rust test template" am: bdf229ce99 am: 6af95e337e am: d3ad2b1dad
Original change: https://android-review.googlesource.com/c/platform/build/+/1832615

Change-Id: I35b0b720a4441e03931cf1be6f0a4f4e0ddf6a6f
2021-09-24 19:20:15 +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
0a88ceb86a Merge "Separate output from diagnostics in Starlark product configuration." am: 335f594e30 am: ee05ac0d49 am: 54676e9237
Original change: https://android-review.googlesource.com/c/platform/build/+/1836493

Change-Id: If5625f90cd3e0d7688af11705af7c020a82dfe0a
2021-09-24 18:39:15 +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
Treehugger Robot
335f594e30 Merge "Separate output from diagnostics in Starlark product configuration." 2021-09-24 17:53:27 +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
3b16e4e9a5 Merge "Reland: Add PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT" am: ad48e9cb87 am: 2a4b948f44 am: 87e59f48fe
Original change: https://android-review.googlesource.com/c/platform/build/+/1834754

Change-Id: I18a259b76e45cbe79f2acee685fad68cc3d1ea93
2021-09-24 03:59:29 +00: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
Adam Shih
d40d176dba create a makefile that holds non AB device setting
Bug: 189894781
Test: build ROM with the binary inside
Change-Id: I99f2b4d3bd57b57ffd3b5066b1306c6fa17c2c85
2021-09-24 10:48:21 +08:00
Treehugger Robot
fb6d0474c2 Merge "Add new clang and clang-tidy warning patterns" am: 84a87eb9ed am: 685bfcdd84 am: 1540e4d2dc
Original change: https://android-review.googlesource.com/c/platform/build/+/1835295

Change-Id: Ic970090a11116da12c31cb20754e9da4b86ded5a
2021-09-24 00:09:16 +00:00
Treehugger Robot
1540e4d2dc Merge "Add new clang and clang-tidy warning patterns" am: 84a87eb9ed am: 685bfcdd84
Original change: https://android-review.googlesource.com/c/platform/build/+/1835295

Change-Id: Iba55a0da197b111936a4fd7d819c26f8d6b32d9b
2021-09-23 23:53:51 +00:00
Treehugger Robot
685bfcdd84 Merge "Add new clang and clang-tidy warning patterns" am: 84a87eb9ed
Original change: https://android-review.googlesource.com/c/platform/build/+/1835295

Change-Id: If92b141c4d4856c193575a250d9094e7cf4718a7
2021-09-23 23:42:06 +00:00
Treehugger Robot
84a87eb9ed Merge "Add new clang and clang-tidy warning patterns" 2021-09-23 23:31:01 +00:00
Chih-Hung Hsieh
3bb6c9448b Add new clang and clang-tidy warning patterns
* New "clang-tidy aborted ..." warnings are reported when
  clang-tidy runs for more than TIDY_TIMEOUT seconds.

Test: warn.py --url=http://cs/android --separator='?l=' build.log > warnings.html
Test: warn.py --gencsv build.log > warnings.csv
Change-Id: Iea62b06b2cf78737d7713dabbcf6d9ac8ba23898
2021-09-23 13:51:08 -07:00
Sarah Chin
c90121fffa [automerger skipped] Merge "Add IRadio modules to VNDK" am: 756e53089a -s ours am: 1393ebb0cb -s ours am: 79b13afec5 -s ours
am skip reason: Merged-In Ifdf60903e715cae26a06501aeb3c578f94d207fd with SHA-1 519c2211d5 is already in history

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

Change-Id: I51a156ce2cfc687b02a3acafb9019a295df9bac4
2021-09-23 17:04:41 +00:00
Colin Cross
392b1989e4 Merge "Remove MAINDEXCLASSES" am: e919f2b8b1 am: 59737777dd am: 349164589f
Original change: https://android-review.googlesource.com/c/platform/build/+/1833628

Change-Id: I9c1779a622d30025da1311ad428e93ccdf6ff02a
2021-09-23 17:04:27 +00:00
Sarah Chin
79b13afec5 [automerger skipped] Merge "Add IRadio modules to VNDK" am: 756e53089a -s ours am: 1393ebb0cb -s ours
am skip reason: Merged-In Ifdf60903e715cae26a06501aeb3c578f94d207fd with SHA-1 519c2211d5 is already in history

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

Change-Id: I84e177e49d200ad5c913adfcd82ca3f3323d60df
2021-09-23 16:47:36 +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
Sarah Chin
1393ebb0cb [automerger skipped] Merge "Add IRadio modules to VNDK" am: 756e53089a -s ours
am skip reason: Merged-In Ifdf60903e715cae26a06501aeb3c578f94d207fd with SHA-1 519c2211d5 is already in history

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

Change-Id: I419623d615683c579b6dcf10604762ca33236449
2021-09-23 16:37:53 +00:00
Sarah Chin
756e53089a Merge "Add IRadio modules to VNDK" 2021-09-23 16:35:42 +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
47aab7d244 Merge "Revert "Add PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT"" am: 1fcf4894d0 am: be4d8a5e8f am: bd69758dd9
Original change: https://android-review.googlesource.com/c/platform/build/+/1834616

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

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

Change-Id: Icf6f43e7014a082e4088ca766f7afac5d8434211
2021-09-23 10:42:17 +00: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
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
487e5017f9 Merge "Add IRadio modules to VNDK" into stage-aosp-master am: 1e620711d7 am: 21ca7f1ccc
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15883583

Change-Id: If8af26aa32af4fd8c5eaad58b52e26d827ff033c
2021-09-23 03:27:18 +00:00
Sarah Chin
21ca7f1ccc Merge "Add IRadio modules to VNDK" into stage-aosp-master am: 1e620711d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15883583

Change-Id: I5b36f70819bad82b6dd54b5abe49afd69234299a
2021-09-23 03:09:29 +00:00