Commit Graph

28743 Commits

Author SHA1 Message Date
Android Build Coastguard Worker
9187ecf7bd Version bump to SP1A.210812.014 [core/build_id.mk]
Change-Id: If3d8c312f126c2281bbaa9ad9224e2779d17c36b
2021-08-26 23:49:44 +00:00
Sasha Smundak
2297d9a395 Fix: print namespace variable names, too.
Bug: 193540681
Test: internal
Change-Id: I1827411e7c6e693666e40fcbcad34ff7bc82ef20
2021-08-26 13:44:54 -07:00
Sasha Smundak
f00e35ecae If filter/filter_out pattern is a list, remove empty elements from it.
Also, fix __mk2regex bug: the returned pattern should end with $.
Bug: 193540681
Test: internal
Change-Id: Ia56856826c6b05ccf857ae5ab7a70609bf4f1e1d

Change-Id: Ie2a9bf62ee48824ce7cd5fe9e9ec2f55311473e3
2021-08-26 13:43:03 -07:00
Mark-PK Tsai
3ec61b4730 Add missing custom kernel module targets
Custom kernel module targets are not in the build dependency rule
which cause the copy command of $(my_copy_pairs) fail.
Add it back to $(my_image_copy_files) and remove the prefixed
$(my_staging_dir) from dest of kernel module copy pair.
Then the makefile can handle it well.

Bug: 195888474
Change-Id: Id8cb4c4991905e8bc53ddb5e60e87a36fe43e803
Signed-off-by: Mark-PK Tsai <mark-pk.tsai@mediatek.com>
2021-08-26 15:41:01 +08:00
Colin Cross
fc8cca1e6c Merge "Propagate USE_HOST_MUSL to Soong" am: ee20ae1a8d am: 05d007ae20
Original change: https://android-review.googlesource.com/c/platform/build/+/1796674

Change-Id: I0eeaabf928b73e29a0bdc6a5dd8dcb6f6ba15776
2021-08-26 05:40:02 +00:00
Colin Cross
05d007ae20 Merge "Propagate USE_HOST_MUSL to Soong" am: ee20ae1a8d
Original change: https://android-review.googlesource.com/c/platform/build/+/1796674

Change-Id: Ie9c9e6ed81a70d699537131a5cd9d77c3f8eca7b
2021-08-26 05:26:46 +00:00
Colin Cross
ee20ae1a8d Merge "Propagate USE_HOST_MUSL to Soong" 2021-08-26 05:12:15 +00:00
Android Build Coastguard Worker
a0df0e6a01 Make change and version bump to SP1A.210812.013
Change-Id: Ic2e0f802e66232718feee78567d7251405190473
2021-08-26 01:11:29 +00:00
Paul Scovanner
3aa50b02bc Revert "Update Security String to 2021-10-06"
This reverts commit 61275cd338.

Reason for revert: SPL bump no longer necessary due to ATT FRC respin

Bug: 193547118
Change-Id: I1df0e12d50471b518653ff865637193bd7ed9101
(cherry picked from commit 1f04c4d3e7)
2021-08-26 01:11:18 +00:00
Presubmit Automerger Backend
7c0923f9ec [automerge] Revert "Update Security String to 2021-10-06" 2p: 1f04c4d3e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15678276

Bug: 193547118
Change-Id: Ie50456b3fc217af0b87677b5074c6225a407e808
2021-08-26 01:04:25 +00:00
Paul Scovanner
1f04c4d3e7 Revert "Update Security String to 2021-10-06"
This reverts commit 61275cd338.

Reason for revert: SPL bump no longer necessary due to ATT FRC respin

Bug: 193547118
Change-Id: I1df0e12d50471b518653ff865637193bd7ed9101
2021-08-26 01:04:17 +00:00
Paul Scovanner
ae3f83ed65 Merge changes from topic "presubmit-am-38a835692f314290aa45b4deba2bb3ab" into sc-dev-plus-aosp
* changes:
  [automerge] Update Security String to 2021-10-06 2p: 61275cd338
  Update Security String to 2021-10-06
2021-08-25 23:49:26 +00:00
Android Build Coastguard Worker
41ab480389 Make change and version bump to SP1A.210812.012
Change-Id: I175168eb38629a4b21960253c001c974805588a6
2021-08-25 23:36:04 +00:00
Paul Scovanner
757dc6997a Update Security String to 2021-10-06
Bug: 193547118
Change-Id: I6bbbf0d627c2e978beb28c2fc4ebac142ca63c1e
(cherry picked from commit 61275cd338)
2021-08-25 23:35:47 +00:00
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
Android Build Coastguard Worker
1d75e88a96 Version bump to SP1A.210812.011 [core/build_id.mk]
Change-Id: I278ce507dc8fbd2a7edf2543739cb26f486c9eb0
2021-08-25 05:50:04 +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
Android Build Coastguard Worker
5d9a35d9dd Version bump to SP1A.210812.010 [core/build_id.mk]
Change-Id: Ieaf75aefb3250881d1b6ab987f27cc0a21ed068e
2021-08-24 18:43:48 +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
Android Build Coastguard Worker
e4d924a377 Version bump to SP1A.210812.009 [core/build_id.mk]
Change-Id: Id3f2789bf6f2f9ceba867bf61d4924f496708188
2021-08-20 22:22:30 +00:00
Android Build Coastguard Worker
f442ccc133 Version bump to SP1A.210812.008 [core/build_id.mk]
Change-Id: Ie739f3cc9e8902572b85c137ecc06c4674d833d4
2021-08-20 19:56:22 +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
Android Build Coastguard Worker
30191d9e87 Version bump to SP1A.210812.007 [core/build_id.mk]
Change-Id: Ie325a81ba9cd19ecd02f55998e504da11d7e92b5
2021-08-20 00:34:54 +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
Android Build Coastguard Worker
81699d0670 Version bump to SP1A.210812.006 [core/build_id.mk]
Change-Id: Idd892a4d2e83afed5789432e5ea1ced183951b42
2021-08-19 03:22:40 +00: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