Sophie Zheng
6ed0846e66
Merge "API coverage Copy generated API list during building cc_library to cc_apis/" am: 8f863178da
am: a44660f3a6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1798348
Change-Id: I7b32436af7fed3f052be925435be4188fd6b3037
2021-08-25 22:11:32 +00:00
Colin Cross
178de6308c
Propagate USE_HOST_MUSL to Soong
...
Support enabling musl in Make builds with USE_HOST_MUSL=true. Only
modules defined in Soong will use musl, but that's almost all host
modules.
Bug: 195988762
Test: m USE_HOST_MUSL=true adb
Change-Id: Ia88f6e20b302d86f2241877b017aebe218d968cf
2021-08-25 15:07:17 -07:00
Sophie Zheng
a44660f3a6
Merge "API coverage Copy generated API list during building cc_library to cc_apis/" am: 8f863178da
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1798348
Change-Id: I3cafb348553174a01cb9fc796d7138d30f5943a9
2021-08-25 21:58:02 +00:00
Sophie Zheng
8f863178da
Merge "API coverage Copy generated API list during building cc_library to cc_apis/"
2021-08-25 21:42:44 +00:00
Paul Scovanner
7ba6989f5d
[automerge] Update Security String to 2021-10-06 2p: 61275cd338
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15676633
Bug: 193547118
Change-Id: Id8bd233e6f86d5499099ffdc980583cdb7b92cae
2021-08-25 20:24:46 +00:00
Paul Scovanner
61275cd338
Update Security String to 2021-10-06
...
Bug: 193547118
Change-Id: I6bbbf0d627c2e978beb28c2fc4ebac142ca63c1e
2021-08-25 20:24:40 +00:00
Alexander Smundak
0d81d7c4de
Merge "Add product-copy-files-by-pattern" am: f80b8930f0
am: 5589c5e85e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1802936
Change-Id: I82e635aca416d05c76aaa3090db7c0c954c33583
2021-08-24 21:27:43 +00:00
Alexander Smundak
5589c5e85e
Merge "Add product-copy-files-by-pattern" am: f80b8930f0
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1802936
Change-Id: I596da8e9e39442a64429f224a7f48387ceb08ea6
2021-08-24 21:09:33 +00:00
Alexander Smundak
f80b8930f0
Merge "Add product-copy-files-by-pattern"
2021-08-24 20:49:27 +00:00
Sasha Smundak
d189ab71f3
Add product-copy-files-by-pattern
...
Several configuration makefiles in the internal
source tree use this pattern
Bug: 190051051
Test: treehugger
Change-Id: Ifab4a7022b9c337966f46e098147fbb5817d9343
2021-08-24 20:49:01 +00:00
Alexander Smundak
fd6bf07dd3
Merge "Fix add_soong_config_namespace/add_soong_config_var macros" am: ed266e5fb8
am: 8fccb65188
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1804317
Change-Id: I0947413cbc2a676cc4354f5e7784ecb46012626b
2021-08-24 16:31:19 +00:00
Alexander Smundak
8fccb65188
Merge "Fix add_soong_config_namespace/add_soong_config_var macros" am: ed266e5fb8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1804317
Change-Id: I2cc898db10140c9a59d9b4376f812d50f147b6d8
2021-08-24 16:18:58 +00:00
Alexander Smundak
ed266e5fb8
Merge "Fix add_soong_config_namespace/add_soong_config_var macros"
2021-08-24 16:03:51 +00:00
Treehugger Robot
a95fb5ca74
Merge "Add zucchini to otatools.zip" am: cc303becee
am: 50663123f6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1804259
Change-Id: I159293264c9613fd809e75b1590827bcab02ab3b
2021-08-23 16:23:10 +00:00
Treehugger Robot
50663123f6
Merge "Add zucchini to otatools.zip" am: cc303becee
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1804259
Change-Id: I4f9c2bd8af7c53537e98c5cb343baaff46b75a23
2021-08-23 16:06:42 +00:00
Treehugger Robot
cc303becee
Merge "Add zucchini to otatools.zip"
2021-08-23 15:50:39 +00:00
Mark-PK Tsai
8c54396580
Strip recovery kernel modules by default
...
Strip recovery kernel modules by default which make
recovery.img smaller.
Also, add BOARD_DO_NOT_STRIP_RECOVERY_MODULES to make
it configurable like vendor modules did.
Change-Id: Id4e8c88b91dad38afc1fec5eae83fcb29c825be3
Signed-off-by: Mark-PK Tsai <mark-pk.tsai@mediatek.com >
2021-08-23 18:04:05 +08:00
TreeHugger Robot
26716e1943
Merge "core/build_id.mk: this would become AOSP master so use AOSP.MASTER" into stage-aosp-master
2021-08-23 09:33:11 +00:00
Sasha Smundak
4a94bb884a
Fix add_soong_config_namespace/add_soong_config_var macros
...
They were failing with an argument containing whitespace. That is,
calling `$(call add_soong_config_namespace, foo)` would result in
the attempt to assign to an empty variable. It went unnoticed
because `ckati` silently ignores such an assignment (`make` is
more diligent and fails).
Bug: 190051051
Test: treehugger
Change-Id: Ifcc168eaf2db725e705887889e732bcd4410db39
2021-08-20 11:18:32 -07:00
Kelvin Zhang
b673bbfbb2
Add zucchini to otatools.zip
...
Zucchini is a new diffing algorithm we plan to add to Android OTA, add
it to otatools.zip first.
Bug: 194237829
Test: th
Change-Id: I9561101decc2d13afb0a8d4329c3ecc044c96c9d
2021-08-20 10:09:20 -07:00
Alexander Smundak
33d2c4b015
Merge changes I2d61d966,Ic4315ce2 am: 23d5ae4f6f
am: c9960bd6c1
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1802636
Change-Id: Iafa061cc8b48c399cfbe1c1ff08f5c4114c32c4f
2021-08-20 16:16:13 +00:00
Alexander Smundak
c9960bd6c1
Merge changes I2d61d966,Ic4315ce2 am: 23d5ae4f6f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1802636
Change-Id: Ie8b1fefc7bc36c99ac2f0d90c1bb3514f1a166e0
2021-08-20 16:05:22 +00:00
Sasha Smundak
6797bfaac1
Fix copy_files implementation
...
It has to copy all the files into the same directory, stripping the
relative path from the source file.
Bug: 193540681
Test: rbcrun build/make/tests/run.rbc
Change-Id: I2d61d966ad94d73131c7ad6016ce319f8d2ae509
2021-08-19 13:56:09 -07:00
Sasha Smundak
6b795dc6a5
Add find_files builtin, use it to fix find_and_copy implementation
...
The macro find-and-copy finds all the files in the given source tree that
match the given filename patten and create <source>:<dest> pair with the
same relative path in the destination tree.
Bug: 193540681
Test: rbcrun build/make/tests/run.rbc
Change-Id: Ic4315ce2fab7a7791ab55dd9eed039205a1c721a
2021-08-19 13:54:53 -07:00
Xin Li
d2cb51b978
core/build_id.mk: this would become AOSP master so use AOSP.MASTER
...
Merged-In: I371275422da3fc1f5fe12b0bafba01af4e7fbca9
Change-Id: I802728b06ea462702a9680b3dedf5693119f964e
2021-08-18 23:40:16 +00:00
Treehugger Robot
7968218079
Merge "Fix kernel module build of custom image" am: bb0d6a42d8
am: 11d1759b32
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1790067
Change-Id: Ibf88352725e43a3ea92f03aa739624c25a669310
2021-08-18 22:02:35 +00:00
Treehugger Robot
11d1759b32
Merge "Fix kernel module build of custom image" am: bb0d6a42d8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1790067
Change-Id: I371275422da3fc1f5fe12b0bafba01af4e7fbca9
2021-08-18 21:40:17 +00:00
Treehugger Robot
bb0d6a42d8
Merge "Fix kernel module build of custom image"
2021-08-18 21:22:05 +00:00
Treehugger Robot
fdae0054f6
Merge "Support product-copy-files-by-pattern macro" am: f00fbb4ae4
am: 874eb86863
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1799527
Change-Id: I5530e9167c64a302d2a8e07940cbd9069343c8fe
2021-08-18 19:43:52 +00:00
Treehugger Robot
874eb86863
Merge "Support product-copy-files-by-pattern macro" am: f00fbb4ae4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1799527
Change-Id: I635c4e2486e5c0f28a1c910df73c686df359ba97
2021-08-18 19:24:43 +00:00
Sasha Smundak
ed1f09cf4a
Support product-copy-files-by-pattern macro
...
Bug: 193566316
Test: rbcrun build/make/tests/run.rbc
Change-Id: Idf462d7f58e8d4a6e8b3a1506306f9eb67130dc8
2021-08-18 09:28:04 -07:00
sophiez
c2ae0e5bbb
API coverage
...
Copy generated API list during building cc_library to cc_apis/
Test: build/soong/soong_ui.bash --make-mode SKIP_ABI_CHECKS=true TARGET_PRODUCT=aosp_cf_x86_phone TARGET_BUILD_VARIANT=userdebug droid dist DIST_DIR=/usr/local/google/home/sophiez/my_dist_dir EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true CLANG_COVERAGE=true SKIP_BOOT_JARS_CHECK=true
Change-Id: I05e6b7b9c9bbbab72718fd926ddda468bde05565
2021-08-17 14:59:36 -07:00
Xin Li
6e58e80617
Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master
2021-08-17 18:14:59 +00:00
Treehugger Robot
b1e7893afd
Merge "Most of the TARGET_COPY_OUT_xxx variables are not constant" am: 82d34b6472
am: f26cd53f1c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1797188
Change-Id: I9f50bfeff4b2cfccd2d04a30f7f53e41b6a48abf
2021-08-17 13:29:04 +00:00
Treehugger Robot
82d34b6472
Merge "Most of the TARGET_COPY_OUT_xxx variables are not constant"
2021-08-17 13:05:31 +00:00
Martin Stjernholm
1e3e52acc6
Merge "Remove PRODUCT_BOOT_JAR_MODULE_OVERRIDES." am: 914c00fa80
am: c4bf3e5725
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1756749
Change-Id: I93d77564816bf23afbe0a8b7ba3ede1cbe427f39
2021-08-17 09:27:28 +00:00
Sasha Smundak
412a0da66f
Most of the TARGET_COPY_OUT_xxx variables are not constant
...
Bug: 193566316
Test: internal
Change-Id: I61ec23a927c3b8c340ce1930c88fe1837bdd35d1
2021-08-16 13:40:13 -07:00
Martin Stjernholm
36444ab0ec
Remove PRODUCT_BOOT_JAR_MODULE_OVERRIDES.
...
This reverts commit efe6a4d748
.
As a result of b/191269918, APEX variants are now consistently
identified by their "runtime names", i.e. their mount names under
/apex. Those names are now also used to identify the APEXes in
PRODUCT_BOOT_JARS and similar variables. That avoids implementing a
global lookup mechanism in Soong, and since they don't vary between
products also makes this override variable unnecessary.
Test: `m nothing` in internal
Bug: 191269918
Bug: 180325915
Change-Id: I6fd3d29d1c032c9f8bda0191781f9d2dc6f199a4
2021-08-15 22:30:03 +01:00
Paul Scovanner
0005491f9b
Update Security String to 2021-10-05 am: 91cbb67645
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15559362
Change-Id: If292a34576d46ba5582fc86a9a5d68b90ab58eb8
2021-08-13 23:00:30 +00:00
Paul Scovanner
91cbb67645
Update Security String to 2021-10-05
...
Bug: 193547118
Change-Id: I4a0cd58b18214b77302ae7ed81c189f4549dc41d
2021-08-13 19:50:02 +00:00
Anton Hansson
f045b10d7d
Merge "Revert "RESTRICT AUTOMERGE Set BUILD_ID=SC"" into sc-dev
2021-08-12 14:20:58 +00:00
Presubmit Automerger Backend
644348a687
[automerge] Revert "RESTRICT AUTOMERGE Set BUILD_ID=SC" 2p: bf70d0ba2a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15532764
Change-Id: I3b7166d28df6d8828f895f839186de78592d259e
2021-08-12 14:20:03 +00:00
Anton Hansson
bf70d0ba2a
Revert "RESTRICT AUTOMERGE Set BUILD_ID=SC"
...
This reverts commit 52f0172772
.
Reason for revert: broke bramble boot test
Bug: 196357202
Change-Id: Ib6f05cd323109076cbc6693d16a74cd1d86a6849
2021-08-12 14:19:54 +00:00
Sanket Chinchalkar
a6ce175958
Merge "Report Performance Test Metrics as JSON File" into sc-dev am: d1bfb2e9ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15502939
Change-Id: Idfd099c87686e4ee3d19b2ee38606c62b1ad6522
2021-08-12 01:31:44 +00:00
Sanket Chinchalkar
d1bfb2e9ed
Merge "Report Performance Test Metrics as JSON File" into sc-dev
2021-08-12 01:17:34 +00:00
Matthew Mintz
bbb5c218c2
RESTRICT AUTOMERGE Set BUILD_ID=SC am: 52f0172772
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15530694
Change-Id: Ia981d368d0aaa35234929314925894c217b112bc
2021-08-11 16:59:42 +00:00
Matthew Mintz
52f0172772
RESTRICT AUTOMERGE Set BUILD_ID=SC
...
Bug: 196178071
Bug: 196043450
Bug: 171506470
Test: adb shell getprop ro.build.fingerprint
Change-Id: I80596f736ce5421530ccaaa035075ceb801a6fe2
2021-08-11 15:09:44 +00:00
Kun Niu
bf90be8a65
Merge "Remove MODULE_BUILD_FROM_SOURCE=true for coverage builds" into sc-dev
2021-08-11 07:02:18 +00:00
Spandan Das
fddb39414a
Merge "Remove MODULE_BUILD_FROM_SOURCE=true for coverage builds" am: 9c1806331d
am: 91a0bf995c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1788549
Change-Id: I2029ac5a55b5a24770b5974ab1087e5cd15b71d7
2021-08-10 23:11:04 +00:00
Spandan Das
9c1806331d
Merge "Remove MODULE_BUILD_FROM_SOURCE=true for coverage builds"
2021-08-10 22:35:42 +00:00