Commit Graph

77178 Commits

Author SHA1 Message Date
Kelvin Zhang
691f8b93c7 Merge "Store EROFS images uncompressed" 2022-02-07 20:55:51 +00:00
Jared Duke
df60c0bb14 Update default system Proguard config rules
Use the `includedescriptorclasses` modifier with the native keep rules
to ensure native method signatures remain preserved. This matches
common native Proguard rules used elsewhere.

Bug: 196084106
Test: m + presubmit
Change-Id: Ie413459ad0f65ce6b8cd6eb34318494c12568c5e
2022-02-07 10:54:51 -08:00
Presubmit Automerger Backend
4dd821f386 [automerge] Add a keys argument to tapas 2p: 5ff4380b5d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16804130

Bug: 216553104
Change-Id: Ibc4ef4f682bbdb50c3aef23ee9cf4e68c247f7de
Merged-In: I2161be9e15f99713e11d22901d6eb7ad3c420093
2022-02-07 18:50:33 +00:00
Colin Cross
5ff4380b5d Add a keys argument to tapas
Add a keys argument to tapas that allows specifying devkeys to
use internal aosp_devkeys_* products that use the internal
devkeys, which will allow building unbundled apps that use platform
keys for testing.

Bug: 216553104
Test: tapas CarMediaApp devkeys
Change-Id: I2161be9e15f99713e11d22901d6eb7ad3c420093
Merged-In: I2161be9e15f99713e11d22901d6eb7ad3c420093
2022-02-07 18:50:22 +00:00
DarkJoker360
db4e956dc1 Fix typos in telephony_vendor product makefile
- Remove blank PRODUCT_COPY_FILES

Change-Id: I4c8a19565dc09a802e630d3b057522b3a3ee1cbd
2022-02-07 19:14:23 +01:00
Jordan Demeulenaere
c546ecbbed Merge "Revert "Add a core configuration that disables the zygote."" am: d183371cda am: c21bcf2636 am: 95e64151be am: 7aa3cc6c20
Original change: https://android-review.googlesource.com/c/platform/build/+/1974419

Change-Id: I5ab1942108e13a2360955c8cd16b8c32d3434516
2022-02-07 15:47:23 +00:00
Jordan Demeulenaere
7aa3cc6c20 Merge "Revert "Add a core configuration that disables the zygote."" am: d183371cda am: c21bcf2636 am: 95e64151be
Original change: https://android-review.googlesource.com/c/platform/build/+/1974419

Change-Id: I306c88bd51b48b5f3f2ac3f57e0828935b783b40
2022-02-07 15:33:42 +00:00
Jordan Demeulenaere
95e64151be Merge "Revert "Add a core configuration that disables the zygote."" am: d183371cda am: c21bcf2636
Original change: https://android-review.googlesource.com/c/platform/build/+/1974419

Change-Id: I34d13158362a27138c99e5b05e50a049dd4ebd43
2022-02-07 15:24:04 +00:00
Jordan Demeulenaere
c21bcf2636 Merge "Revert "Add a core configuration that disables the zygote."" am: d183371cda
Original change: https://android-review.googlesource.com/c/platform/build/+/1974419

Change-Id: I298b4740a81d4219554ac0bbfa6683fbbd84c300
2022-02-07 15:09:14 +00:00
Jordan Demeulenaere
d183371cda Merge "Revert "Add a core configuration that disables the zygote."" 2022-02-07 14:53:40 +00:00
Jordan Demeulenaere
fe3d2e672a Revert "Add a core configuration that disables the zygote."
Revert submission 1964759-master-I4f918502e611e950fa039e4e2ed817c97b928ba2

Reason for revert: b/217993447
Reverted Changes:
I4f918502e:Add a core configuration that disables the zygote....
I4f918502e:Add a core configuration that disables the zygote....
I4f918502e:Add a core configuration that disables the zygote....

Change-Id: I5d51a021fea89a0ab6c73349d93117d60cfc9350
2022-02-07 09:05:29 +00:00
Jooyung Han
39259ec1a4 A custom APEX signing tool with --signing_args
apex_utils.SignApex() has `signing_args` argument which is supposed to
be passed to avbtool to set `--signing_helper` or
`--signing_helper_with_files`.

A custom APEX signing tool which relies on avbtool's signing should pass
the same arguments when signing_args is set.

This change passes signing_args verbatim to the custom APEX signing tool
via --signing_args argument.

Bug: 216971834
Test: tbd
Change-Id: I8aaec9440c4536e11e1e4a1dd4ae5f4fe32d4f23
2022-02-07 15:56:53 +09:00
Pirama Arumuga Nainar
d6b0a87ed7 Add GLOBAL_CLANG_EXTERNAL_CFLAGS_NO_OVERRIDE to third-party code
Bug: http://b/215753485

This allows enabling a new warning from the compiler update for
first-party code.  This is less precise than the check in build/soong
(also overrides for vendor/google, for e.g.) because of being written in
Make.

Test: With new clang, verify the following:
    lunch oriole;
    m out/target/product/oriole/obj_arm/SHARED_LIBRARIES/libexynosdisplay_intermediates/libresource/ExynosMPP.o
Change-Id: I13080fec71e282c4b528a6d01b967b1c0c4aef02
2022-02-05 13:50:41 -08:00
Treehugger Robot
cedb81cb2f Merge "Add a core configuration that disables the zygote." am: fb9ec40e65 am: ea27a5efb7 am: abbe220629 am: c38aec0bdb
Original change: https://android-review.googlesource.com/c/platform/build/+/1964621

Change-Id: Ic0a2f9a675d0132ac7cc0269f65508c39bb399d9
2022-02-05 00:55:09 +00:00
Treehugger Robot
c38aec0bdb Merge "Add a core configuration that disables the zygote." am: fb9ec40e65 am: ea27a5efb7 am: abbe220629
Original change: https://android-review.googlesource.com/c/platform/build/+/1964621

Change-Id: Ic1a16ee01fd889be67b24a2b455bf7ccc905bcba
2022-02-05 00:37:46 +00:00
Treehugger Robot
abbe220629 Merge "Add a core configuration that disables the zygote." am: fb9ec40e65 am: ea27a5efb7
Original change: https://android-review.googlesource.com/c/platform/build/+/1964621

Change-Id: Id82b621d622f3f8076f14a9c46321787350a25d1
2022-02-05 00:25:44 +00:00
Treehugger Robot
ea27a5efb7 Merge "Add a core configuration that disables the zygote." am: fb9ec40e65
Original change: https://android-review.googlesource.com/c/platform/build/+/1964621

Change-Id: Ie3be954457563358580d9af2fabcf69559566458
2022-02-05 00:09:39 +00:00
TreeHugger Robot
591bd37632 Merge "Add camera aidl interfaces" 2022-02-05 00:06:59 +00:00
Treehugger Robot
fb9ec40e65 Merge "Add a core configuration that disables the zygote." 2022-02-04 23:52:33 +00:00
Bob Badour
49dd4f75ff Add support for a product name as well as title.
Bug: 68860345
Bug: 151177513
Bug: 151953481
Bug: 213388645
Bug: 210912771

Test: m all
Test: m systemlicense
Test: m htmlnotice; out/soong/host/linux-x85/htmlnotice ...
Test: m textnotice; out/soong/host/linux-x85/textnotice ...
Test: m xmlnotice; out/soong/host/linux-x85/xmlnotice ...

where ... is the path to the .meta_lic file for the system image. In my
case if

$ export PRODUCT=$(realpath $ANDROID_PRODUCT_OUT --relative-to=$PWD)

... can be expressed as:

${PRODUCT}/gen/META/lic_intermediates/${PRODUCT}/system.img.meta_lic

Change-Id: Id5b2ebe3752081e3a89bba1d717cf103f7846043
2022-02-04 14:50:59 -08:00
Colin Cross
5b7d4e10bf Merge "Add a keys argument to tapas" 2022-02-03 18:30:18 +00:00
Bob Badour
619a016423 Merge "Regularize command-line flags." am: 339edb60d2 am: 00e438dd74 am: 1dca1af739 am: 1c01e9b967
Original change: https://android-review.googlesource.com/c/platform/build/+/1969760

Change-Id: Ib492aaa8daa5a08bca1b5f3636494a4c0f83b598
2022-02-03 04:41:10 +00:00
Bob Badour
1c01e9b967 Merge "Regularize command-line flags." am: 339edb60d2 am: 00e438dd74 am: 1dca1af739
Original change: https://android-review.googlesource.com/c/platform/build/+/1969760

Change-Id: I6df59bb9bf09a23c51d9285b2abc2b19ea1755aa
2022-02-03 04:21:47 +00:00
Kelvin Zhang
4a63e8e3c5 Merge "Add zhangkelvin@ as owner for release tools scripts" am: 3b72e28421 am: 075084d909 am: b748ae9f86 am: 8489a72ede
Original change: https://android-review.googlesource.com/c/platform/build/+/1969479

Change-Id: Id71945739ce069c3ea9d288cf7efd568b9ebf8d8
2022-02-03 04:13:41 +00:00
Bob Badour
c5daefea03 Merge "license metadata xml notice files" am: a822469f2a am: ce5a9303ac am: 55c9a6b19c am: cb3bf880b7
Original change: https://android-review.googlesource.com/c/platform/build/+/1966147

Change-Id: I861b2220cfcf0754a255203c434413b43831260d
2022-02-03 04:13:32 +00:00
Bob Badour
1dca1af739 Merge "Regularize command-line flags." am: 339edb60d2 am: 00e438dd74
Original change: https://android-review.googlesource.com/c/platform/build/+/1969760

Change-Id: Ib85eb5b7fda18d0e47147c1ca6e7dff1f273638a
2022-02-03 04:06:11 +00:00
Kelvin Zhang
8489a72ede Merge "Add zhangkelvin@ as owner for release tools scripts" am: 3b72e28421 am: 075084d909 am: b748ae9f86
Original change: https://android-review.googlesource.com/c/platform/build/+/1969479

Change-Id: I44f1dd376d3fee74f9658465ad224ee582d993e5
2022-02-03 03:54:17 +00:00
Bob Badour
cb3bf880b7 Merge "license metadata xml notice files" am: a822469f2a am: ce5a9303ac am: 55c9a6b19c
Original change: https://android-review.googlesource.com/c/platform/build/+/1966147

Change-Id: I781e6df5f7bb2979d6d921f78604066ffa2590a8
2022-02-03 03:54:09 +00:00
Bob Badour
00e438dd74 Merge "Regularize command-line flags." am: 339edb60d2
Original change: https://android-review.googlesource.com/c/platform/build/+/1969760

Change-Id: Idfddaa7a9fe398734278e0d889108becb63f4e59
2022-02-03 03:48:40 +00:00
Kelvin Zhang
b748ae9f86 Merge "Add zhangkelvin@ as owner for release tools scripts" am: 3b72e28421 am: 075084d909
Original change: https://android-review.googlesource.com/c/platform/build/+/1969479

Change-Id: I29d4d21733d97ba3225f393fce76d23ddc808098
2022-02-03 03:36:31 +00:00
Bob Badour
55c9a6b19c Merge "license metadata xml notice files" am: a822469f2a am: ce5a9303ac
Original change: https://android-review.googlesource.com/c/platform/build/+/1966147

Change-Id: Ib7298e85bf82ed3643d0fb5233c62e2286543f37
2022-02-03 03:35:52 +00:00
Bob Badour
339edb60d2 Merge "Regularize command-line flags." 2022-02-03 03:29:20 +00:00
Kelvin Zhang
075084d909 Merge "Add zhangkelvin@ as owner for release tools scripts" am: 3b72e28421
Original change: https://android-review.googlesource.com/c/platform/build/+/1969479

Change-Id: Id218861921c646bdc7df57758168c217be0b0fb7
2022-02-03 03:19:50 +00:00
Bob Badour
ce5a9303ac Merge "license metadata xml notice files" am: a822469f2a
Original change: https://android-review.googlesource.com/c/platform/build/+/1966147

Change-Id: If958a594814b9c06a817d3e4d02c3e7b5d45a4fa
2022-02-03 03:19:40 +00:00
Kelvin Zhang
3b72e28421 Merge "Add zhangkelvin@ as owner for release tools scripts" 2022-02-03 03:05:34 +00:00
Bob Badour
a822469f2a Merge "license metadata xml notice files" 2022-02-03 03:04:50 +00:00
Bob Badour
682e1bae57 Regularize command-line flags.
All the notice binaries have -title

All the binaries that can -stripPrefix can strip multiple.

Bug: 68860345
Bug: 151177513
Bug: 151953481
Bug: 213388645
Bug: 210912771

Test: m all
Test: m systemlicense
Test: m bom; out/soong/host/linux-x85/bom ...
Test: m dumpgraph; out/soong/host/linux-x85/dumpgraph ...
Test: m dumpresolutions; out/soong/host/linux-x85/dumpresolutions ...
Test: m htmlnotice; out/soong/host/linux-x85/htmlnotice ...
Test: m rtrace; out/soong/host/linux-x85/rtrace ...
Test: m textnotice; out/soong/host/linux-x85/textnotice ...
Test: m xmlnotice; out/soong/host/linux-x85/xmlnotice ...

where ... is the path to the .meta_lic file for the system image. In my
case if

$ export PRODUCT=$(realpath $ANDROID_PRODUCT_OUT --relative-to=$PWD)

... can be expressed as:

${PRODUCT}/gen/META/lic_intermediates/${PRODUCT}/system.img.meta_lic

Change-Id: I08357bf1adb048abba6563cf3cea6ee6d60405e0
2022-02-02 15:32:50 -08:00
Bob Badour
f87922450e license metadata xml notice files
Introduce the below command-line tool:

xmlnotice outputs a NOTICE.xml file constructed from the license
texts of the transitive closure of dependencies.

Bug: 68860345
Bug: 151177513
Bug: 151953481
Bug: 213388645
Bug: 210912771

Test: m all
Test: m systemlicense
Test: m xmlnotice; out/soong/host/linux-x85/xmlnotice ...

where ... is the path to the .meta_lic file for the system image. In my
case if

$ export PRODUCT=$(realpath $ANDROID_PRODUCT_OUT --relative-to=$PWD)

... can be expressed as:

${PRODUCT}/gen/META/lic_intermediates/${PRODUCT}/system.img.meta_lic

Change-Id: I267effd3a1c1b981bcdc5e058dce561a2d4a7948
2022-02-02 15:32:50 -08:00
Kelvin Zhang
834f5d458f Store EROFS images uncompressed
Test: th
Change-Id: I53005bee139079afe25da231ca1d42f03fa010a5
2022-02-02 12:52:34 -08:00
Kelvin Zhang
4f8f972a5b Add zhangkelvin@ as owner for release tools scripts
Change-Id: Ic861bc11d6a7d80c0d22a05ce35998753bb60752
2022-02-02 12:52:34 -08:00
Treehugger Robot
fead7b745f Merge "core & tools: system_dlkm: add dynamic partition" am: ef25de413e am: 0f5c34115c am: b4a4dee4c9 am: 144934f1fc
Original change: https://android-review.googlesource.com/c/platform/build/+/1963868

Change-Id: I122e7b631f692e9c5e05948e8fe25a24d4626f5d
2022-02-02 07:20:35 +00:00
Treehugger Robot
144934f1fc Merge "core & tools: system_dlkm: add dynamic partition" am: ef25de413e am: 0f5c34115c am: b4a4dee4c9
Original change: https://android-review.googlesource.com/c/platform/build/+/1963868

Change-Id: Iafeb57ac3c34e9a0acc9d3aa4fa8a8d117be1b25
2022-02-02 07:03:07 +00:00
Treehugger Robot
b4a4dee4c9 Merge "core & tools: system_dlkm: add dynamic partition" am: ef25de413e am: 0f5c34115c
Original change: https://android-review.googlesource.com/c/platform/build/+/1963868

Change-Id: I67f6f0e0c4e1946b1fdfc81b097a0566d54eb324
2022-02-02 06:39:10 +00:00
Treehugger Robot
0f5c34115c Merge "core & tools: system_dlkm: add dynamic partition" am: ef25de413e
Original change: https://android-review.googlesource.com/c/platform/build/+/1963868

Change-Id: Id6e2f44307b6f801056c704f4524d4c22d830623
2022-02-02 06:22:41 +00:00
Treehugger Robot
ef25de413e Merge "core & tools: system_dlkm: add dynamic partition" 2022-02-02 06:04:07 +00:00
Treehugger Robot
e116bf237b Merge "Add support for gzipping html output." am: 91e4f9db50 am: 7ceb15511b am: b41f62b0fe am: 73a854afe6
Original change: https://android-review.googlesource.com/c/platform/build/+/1966146

Change-Id: I0353ad51b2e24e5f3a4958935f03dcf4f16d05af
2022-02-02 05:50:28 +00:00
Treehugger Robot
73a854afe6 Merge "Add support for gzipping html output." am: 91e4f9db50 am: 7ceb15511b am: b41f62b0fe
Original change: https://android-review.googlesource.com/c/platform/build/+/1966146

Change-Id: I7f118a462b477f136b27f989946f8449fce95f52
2022-02-02 05:30:50 +00:00
Treehugger Robot
b41f62b0fe Merge "Add support for gzipping html output." am: 91e4f9db50 am: 7ceb15511b
Original change: https://android-review.googlesource.com/c/platform/build/+/1966146

Change-Id: Ib99ad444a37428fe8edacbe2f1b806918e78e130
2022-02-02 05:10:35 +00:00
Treehugger Robot
7ceb15511b Merge "Add support for gzipping html output." am: 91e4f9db50
Original change: https://android-review.googlesource.com/c/platform/build/+/1966146

Change-Id: I8a8dde8f3ecab4012682359205b1ab63ea693db4
2022-02-02 04:45:35 +00:00
Treehugger Robot
91e4f9db50 Merge "Add support for gzipping html output." 2022-02-02 04:32:05 +00:00