Commit Graph

38386 Commits

Author SHA1 Message Date
Treehugger Robot
47992dd860 Merge changes Ie2012adb,Ib0283ca6 am: 03beb0ec77
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1784476

Change-Id: I3d73ff1a1add10ff5efd9477e611992fb2a24fc1
2021-08-04 04:49:31 +00:00
Treehugger Robot
03beb0ec77 Merge changes Ie2012adb,Ib0283ca6
* changes:
  static rust binaries are also prohibited in APEXes
  Revert "Revert "Prohibit static executable in APEX""
2021-08-04 04:35:20 +00:00
Treehugger Robot
099a42701a Merge "Update documentation for genrule and sdk_library" am: 8662a3793b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1780976

Change-Id: Id213c1f615811718476f7546b683b488b711a0f4
2021-08-04 00:29:51 +00:00
Treehugger Robot
8662a3793b Merge "Update documentation for genrule and sdk_library" 2021-08-04 00:14:31 +00:00
Alexander Smundak
683ee70403 Merge "Improve dynamic inherit paths handling" am: 408a4bece5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1784410

Change-Id: I5ae87fccc81847956b0e633274989b566b664af2
2021-08-03 20:36:12 +00:00
Alexander Smundak
408a4bece5 Merge "Improve dynamic inherit paths handling" 2021-08-03 20:14:39 +00:00
Christian Wailes
d793c89474 Merge "Conditionally apply rustdoc flags to third party crates" am: 99bc67a548
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1783747

Change-Id: Iad698ced1dc587506374c84d1c1295c26c3a49a1
2021-08-03 20:02:24 +00:00
Christian Wailes
99bc67a548 Merge "Conditionally apply rustdoc flags to third party crates" 2021-08-03 19:39:17 +00:00
Sasha Smundak
43137a06f6 Translate copy-files, add_soong_config_namespace and add_soong_config_var_value macros am: 3deb968aef
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1778796

Change-Id: Iff797035dff7e7fb9f2ab1a4bb8f4360b40255fc
2021-08-03 18:29:33 +00:00
Sasha Smundak
90be8c5589 Improve dynamic inherit paths handling
Allow up to 150 inherited paths matching the pattern.
When seeing `include $(BOARD_CONFIG_VENDOR_PATH)/BoardConfigVendor.mk`,
search only vendor/google_devices

Bug: 193566316
Test: internal
Change-Id: Ic88cb116075512f87d5a5f7a7f32dabd09ff640c
2021-08-03 11:06:54 -07:00
Sasha Smundak
3deb968aef Translate copy-files, add_soong_config_namespace and add_soong_config_var_value macros
Bug: 194521362
Test: internal

Change-Id: I88fb62f057476d96dfb056813a900e8497e7bbb9
2021-08-03 11:06:54 -07:00
Romain Jobredeaux
9a4c0e8b2d Merge "Add prebuilts/r8 to the bp2build BUILD file overwriting exception list." am: 596a78949c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1784648

Change-Id: Idf4de922f6e7a00aead9623ba133774168b14490
2021-08-03 16:25:20 +00:00
Romain Jobredeaux
596a78949c Merge "Add prebuilts/r8 to the bp2build BUILD file overwriting exception list." 2021-08-03 16:07:16 +00:00
Liz Kammer
72a3729ced Merge "Correct isThirdParty check" am: 0f77bb4304
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1769705

Change-Id: Id42ea92cf189fd69daa7687a375546999b7a56e0
2021-08-03 15:10:22 +00:00
Liz Kammer
0f77bb4304 Merge "Correct isThirdParty check" 2021-08-03 14:54:12 +00:00
Joel Galenson
06551aea92 Merge "Add librustutils to the Rust allowlist and remove libc." am: 48a7fb6afa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1782214

Change-Id: I6ea4aa3989d68c1c65739a01fb4eefcea383c214
2021-08-03 14:32:48 +00:00
Joel Galenson
48a7fb6afa Merge "Add librustutils to the Rust allowlist and remove libc." 2021-08-03 14:20:06 +00:00
Ivan Lozano
114c7ea43f Merge "rust: Disable dead stripping for fuzzers." am: 2bba729971
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1784687

Change-Id: I14e4a28c3c54c9e39d917e1d8dbcb718af19d6d6
2021-08-03 13:10:47 +00:00
Ivan Lozano
2bba729971 Merge "rust: Disable dead stripping for fuzzers." 2021-08-03 12:54:12 +00:00
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
d12979d09a static rust binaries are also prohibited in APEXes
Also fixes a bug that the test runs for host APEXes like
com.android.art.host.

Bug: 185971244
Test: m
Test: build mainline_modules target on aosp-master
Change-Id: Ie2012adbf2f4eda5454d5eaa30f128fb1e20ad37
2021-08-03 07:52:46 +00:00
Jiyong Park
192600a7d0 Revert "Revert "Prohibit static executable in APEX""
This reverts commit 2125aab504.

Reason for revert: relanding along with a forward fix

Change-Id: Ib0283ca6beefa2f3073860287d00553ad0af6317
2021-08-03 07:52:17 +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
Chris Wailes
b2703adce4 Conditionally apply rustdoc flags to third party crates
This CL changes the logic in rust/builder.go so that some rustdoc flags
are only applied to external crates.  This will allow us to since
warnings and deal with soft-failures in external crates while allowing
us to be more strict with our internal Rust code.

Bug: 195136952
Test: m rustdoc
Change-Id: Icdde304bbbb323cae9657e8f842f58ae79e811ce
2021-08-02 11:50:34 -07:00
Liz Kammer
067b889762 Correct isThirdParty check
Previously, isThirdParty check was over-selecting for third-party-ness,
the only non-third-party paths were those explicitly excluded from
typically third party directories, results in ~all code being considered
third party.

Updated test to ensure bionic is not considered third party, which fails
without this change.

Test: go soong tests
Change-Id: Id371aaad2ceef2b3163384fa84712397877cbe90
2021-08-02 11:50:34 -07:00
Romain Jobredeaux
8c98c25f07 Add prebuilts/r8 to the bp2build BUILD file overwriting exception list.
Change-Id: I241d5e9a1bf1269a033d1f7c58e851610105c7fa
Test: b build prebuilts/r8:r8_jar_import
Bug: 194103854
2021-08-02 17:53:24 +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
Ivan Lozano
aa7c980002 rust: Disable dead stripping for fuzzers.
Without `-C link-dead-code`, Rust fuzzers may fail to start fuzzing.
See the cargo-fuzz issue in the code comment for details. This patch
disables dead stripping for our fuzzers by default.

Bug: 193200135
Test: Flag emitted when building Rust fuzzers.
Test: Fuzzer runs on device.
Change-Id: I530de30e9a57db206bcbf3d2d3d371628eef8934
2021-08-02 11:11:11 -04: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
Joel Galenson
84be2fc380 Add librustutils to the Rust allowlist and remove libc.
Bug: 182498247
Test: Build
Change-Id: I0ea6c9b61cfdb667646e0067098f0ee5b9d9a2b3
2021-07-30 07:47:56 -07:00