Commit Graph

38359 Commits

Author SHA1 Message Date
Jiyong Park
2af22b8729 Merge "Revert "Prohibit static executable in APEX"" am: 2fe71a5165
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1784474

Change-Id: Id7deac26695420aeaf2ec952326b3df9835d97c8
2021-08-03 08:07:04 +00:00
Jiyong Park
2fe71a5165 Merge "Revert "Prohibit static executable in APEX"" 2021-08-03 07:50:26 +00:00
Yen-Chao Chen
2125aab504 Revert "Prohibit static executable in APEX"
This reverts commit 3a8130c797.

Reason for revert: Build failed.

Change-Id: I28c72c8c3adaeb23bff9bffe3994971aa3f2e4f4
2021-08-03 04:51:12 +00:00
Jiyong Park
7986f564b6 Merge "Prohibit static executable in APEX" am: d8a3513155
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1779746

Change-Id: I59bfe18a8a11fbc8f145bd3bef3bff41855ac5a9
2021-08-03 04:01:03 +00:00
Jiyong Park
d8a3513155 Merge "Prohibit static executable in APEX" 2021-08-03 03:48:01 +00:00
Sasha Smundak
218491da3a Translate more Make builtin functions am: 16e0773e7f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1778588

Change-Id: Icaaa317511860d61d5a586d0018aa94760051139
2021-08-03 01:30:59 +00:00
Sasha Smundak
d026b1caf2 Allow dynamically calculated inherit-product path am: 6609ba7664
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1778587

Change-Id: If5888089cfb8c7aa7078d3f201ed43e706b2b5ee
2021-08-03 01:30:57 +00:00
Sasha Smundak
16e0773e7f Translate more Make builtin functions
Adds support for abspath/firstword/dir/lastword/notdir functions

Bug: 194521362
Test: internal
Change-Id: I34dd6a81f21a4ef2f8f0a72bd80284ced8957b5c
2021-08-02 15:13:59 -07:00
Sasha Smundak
6609ba7664 Allow dynamically calculated inherit-product path
Bug: 193566316
Test: internal
Change-Id: Iaa7b68cf459f9a694ae9d37a32c9372cf8a8335a
2021-08-02 14:35:45 -07:00
Treehugger Robot
3d9aaa82f2 Merge changes I43e61218,Iea36ecaa am: e083a05ad0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1784828

Change-Id: Ib2ed6331616d2fa118d8591134bf624c9925266a
2021-08-02 20:37:47 +00:00
Treehugger Robot
e083a05ad0 Merge changes I43e61218,Iea36ecaa
* changes:
  Add an option to gather CPU profile.
  Allow $(filter ...) with arbitrary args if its result is compared to the empty string
2021-08-02 20:18:17 +00:00
Liz Kammer
460f522f79 Merge "Set mixed builds use product-config based target" am: 93f51a3cff
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1778965

Change-Id: I8ac7d712f534ffb0dfad25a03c1cc00639cf91fe
2021-08-02 16:42:00 +00:00
Yuntao Xu
eb5bcf21ec Merge "remove target from every intermediate depFile" am: 1b05df5fd4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1782649

Change-Id: I7def89e73fa35b8b6075435b3046f56f4671e3c9
2021-08-02 16:41:54 +00:00
Liz Kammer
93f51a3cff Merge "Set mixed builds use product-config based target" 2021-08-02 16:38:29 +00:00
Yuntao Xu
1b05df5fd4 Merge "remove target from every intermediate depFile" 2021-08-02 16:28:27 +00:00
Sasha Smundak
3880279a0c Add an option to gather CPU profile.
Bug: 172923994
Test: internal
Change-Id: I43e6121855e909eaca2204a811f12174fb8b6b5f
2021-08-01 14:46:56 -07:00
Sasha Smundak
0554d760fb Allow $(filter ...) with arbitrary args if its result is compared to the empty string
Bug: 172923994
Test: internal
Change-Id: Iea36ecaa8940cf4e495ad63125f10d733c3eb2ee
2021-08-01 14:41:03 -07:00
Dan Willemsen
d7cacef34a Merge "Bump minimum MacOS version to 10.13" am: db45fb250d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1780977

Change-Id: Ia9f9763792d724b18c0c553af8a812662b8312fa
2021-07-30 18:27:11 +00:00
Justin Yun
1a45180fe7 Rewrite snapshot dependencies for vndk-ext am: 27b9572433
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1779758

Change-Id: I00073cbd7a9a3345023825d149cef70d118529c8
2021-07-30 18:26:34 +00:00
Yi-Yo Chiang
e3c9611b24 Merge changes from topic "variational-required" am: d7b95f94a1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1739833

Change-Id: Iacab63f084236823bd32f678f20d3d1ced16bf3b
2021-07-30 18:26:28 +00:00
Dan Willemsen
ea56c71d79 go.mod: Add indirect exclusions/redirections from golang-protobuf upgrade am: 54d2e21fa8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1782247

Change-Id: Ibe4366e9de565e782d660fe5cb74e859aba39aa1
2021-07-30 18:26:15 +00:00
Dan Willemsen
db45fb250d Merge "Bump minimum MacOS version to 10.13" 2021-07-30 17:22:56 +00:00
Yuntao Xu
56cc658b93 remove target from every intermediate depFile
1. The current logic in the rsCppCmdLine only removes the target from the
first intermediated depFile, which is different from the logic in Make, see
https://source.corp.google.com/android/build/make/core/definitions.mk;l=1078
2. The expected logic, as that in Make, is to remove the target from every
intermediate depFile, if there are many, before the concatenation;
3. This bug would cause dependency cycle error, please check the bug number
below for more details;
4. The fix is to make sure the logic here is the same as that in Make.

Bug: 195036632
Test: m CtsRsCppTestCases with the converted Android.bp file (run more than
once to make sure no error occurs)
Test: manually checked the gen/rs/rs.stamp.d file to make sure there
is only one target on the top (the same as that built with the former
Android.mk file)
Test: TreeHugger

Change-Id: If79e3e5e7bc18a6fddcf56c0168daea93726afc6
2021-07-30 09:47:07 -07:00
Dan Willemsen
bafb547656 Merge commit 'f42f01b49d3e3d28ef2b0ae8f90cacd6f2b36ce2' into stage-aosp-master
Bug: 195110722
Change-Id: Ie24ce00856ecb1631d944741f2f0f9fe06f1cca5
2021-07-30 08:34:03 -07:00
Justin Yun
27b9572433 Rewrite snapshot dependencies for vndk-ext
VNDK-ext libraries have dependency on VNDK libraries. When building
against snapshots, the dependency must be rewritten with the
snapshots.

Bug: 194864314
Test: m nothing
Change-Id: I1244c6a6590e89b344ab39514bb5142d36b04268
2021-07-30 10:49:02 +00:00
Yi-Yo Chiang
d7b95f94a1 Merge changes from topic "variational-required"
* changes:
  cc/cc.go: Support per-image-variation "required"
  android/androidmk.go: Calls *RequiredModuleNames() to get required modules
2021-07-30 10:09:40 +00:00
Dan Willemsen
54d2e21fa8 go.mod: Add indirect exclusions/redirections from golang-protobuf upgrade
The golang-protobuf upgrade brought in new dependencies, which broke the
hermeticity of our go.mod redirections. Fix those up so they get
excluded or redirected to the locations in the tree.

Test: cd build/soong/cc; go test .
Change-Id: I012d11fad3b5509b213093e3c5889a27e641b868
2021-07-29 13:34:51 -07:00
Dan Willemsen
3dc4326ce7 Bump minimum MacOS version to 10.13
We've removed all of our buildbots running 10.10, and Android Studio
requires 10.14+, so our oldest users are now the 10.13 buildbots.

Bug: 191879468
Change-Id: Ie9fdb59f12bb672c5f2448cb558f54a2e10039fb
2021-07-29 12:18:29 -07:00
Dan Willemsen
f42f01b49d Merge "Upgrade to golang protobuf api v2" 2021-07-29 18:29:26 +00:00
Ivan Lozano
bf59435993 Merge "rust: Prevent manually defined lib link flags." am: c4dae8eb27
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1778836

Change-Id: Iecdc62ac6306f27cd6ed5b7b314a50cdaef787b6
2021-07-29 17:20:44 +00:00
Ivan Lozano
c4dae8eb27 Merge "rust: Prevent manually defined lib link flags." 2021-07-29 17:06:09 +00:00
satayev
59eb1584f6 Merge "Rename UpdatableSystemServerJars to ApexSystemServerJars." am: 0d8c497535
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1779990

Change-Id: I2c75a33e54bf0eaee619e6cd6fee80eab71c11ce
2021-07-29 11:40:50 +00:00
satayev
0d8c497535 Merge "Rename UpdatableSystemServerJars to ApexSystemServerJars." 2021-07-29 11:23:43 +00:00
Kiyoung Kim
c2da7caea5 Merge "Create new module type 'snapshot_etc'" am: 754b9cce24
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1775266

Change-Id: I54b77bfa1712a6de19d7ddb010c7996b61c2d7fa
2021-07-29 01:28:47 +00:00
Jingwen Chen
a60ff22cf4 Merge "Add tzdata packages to bp2build allowlist." am: 2181be3a25
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1779761

Change-Id: Ic6a11b29e9c889262a7319b08ce91bb5ab8247ca
2021-07-29 01:28:38 +00:00
Kiyoung Kim
754b9cce24 Merge "Create new module type 'snapshot_etc'" 2021-07-29 01:27:11 +00:00
Jingwen Chen
2181be3a25 Merge "Add tzdata packages to bp2build allowlist." 2021-07-29 01:04:43 +00:00
Treehugger Robot
f33614f354 Merge "Added a flag to the rustdoc invocation" am: 58fd4c43ea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1781013

Change-Id: Ic8513e68e45306150ae0489135eb08276150bbe2
2021-07-28 20:49:37 +00:00
Treehugger Robot
58fd4c43ea Merge "Added a flag to the rustdoc invocation" 2021-07-28 20:31:03 +00:00
Chris Wailes
9953a1999c Added a flag to the rustdoc invocation
This CL adds the '-A renamed_and_removed_lints' argument to the rustdoc
invocation.  This will allow the compiler to be updated even when
libraries have not fixed all of the new warnings in their codebase.

Bug: 194899248
Test: m rustdoc
Change-Id: Ife9fd6dbd7223c9964a8117d60e8be878c8f7332
2021-07-28 12:09:28 -07:00
Treehugger Robot
15852944b2 Merge "Fix null pointer exception on error" am: 345ec5bba7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1780486

Change-Id: I80914ba6fddd74a9eb6038ed929cbb90483731cb
2021-07-28 18:11:19 +00:00
Treehugger Robot
345ec5bba7 Merge "Fix null pointer exception on error" 2021-07-28 17:54:49 +00:00
Jingwen Chen
739d01e5ef Add tzdata packages to bp2build allowlist.
Test: bp2build CI

Test: Build tzdata APEX with Bazel

Bug: 194644492
Change-Id: I05854f5f7dceeb197c1b7d8e746eb6fc07d93581
2021-07-28 15:26:20 +00:00
Christian Wailes
bbf545a411 Merge "Update the Rust prebuilt version number" am: 3d976a7148
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1780205

Change-Id: I4f3a07cffbf833205d6af9ad2e548054929e1e5c
2021-07-28 14:18:38 +00:00
Christian Wailes
3d976a7148 Merge "Update the Rust prebuilt version number" 2021-07-28 14:05:25 +00:00
Rupert Shuttleworth
6c4a3a57ee Merge "Add initial bp2build convert for prebuilt_etc modules." am: aa1777feef
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1780169

Change-Id: Ia0c3cb12c99f4fa0428cf42447fd3b3a7cdccb24
2021-07-28 13:56:43 +00:00
Rupert Shuttleworth
aa1777feef Merge "Add initial bp2build convert for prebuilt_etc modules." 2021-07-28 13:43:26 +00:00
satayev
492b17d533 Rename UpdatableSystemServerJars to ApexSystemServerJars.
This is consistent with naming for boot jars, e.g. ApexBootJars.

Bug: 191127295
Test: presubmit
Change-Id: I6e8828d55ac86b7f5260ed7f8d4eca1c0b3dced8
2021-07-28 14:04:49 +01:00
Rupert Shuttleworth
b48abbcd56 Merge "Add initial bp2build support for converting android_app_certificate modules." am: 569a23ae00
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1780168

Change-Id: I761a55f9649783a7da1a9c117c962ef4461c3697
2021-07-28 12:36:02 +00:00
Rupert Shuttleworth
5d80f5a189 Merge "Add support for prebuilts attribute to the bp2build APEX converter." am: 36a3ef297f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1781087

Change-Id: Ib1d3785780db20e98537a9e336013d8f5e8e77a6
2021-07-28 12:35:44 +00:00