Commit Graph

20910 Commits

Author SHA1 Message Date
Treehugger Robot
ffdfccd54c Merge "Inclusive fix: Replace sanity to validation in java/sdk.go" am: 3d8e506c3a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1374701

Change-Id: I9ee262036e17e56343a16279d5f8c3da8769861a
2020-07-28 23:54:08 +00:00
Treehugger Robot
69400f71e3 Merge "Inclusive fix: change the word dummy to fake in zip_test.go" am: e119a5c554
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1374700

Change-Id: I35350eb24d9a1dde0740b5d88b521aded7ea6194
2020-07-28 23:53:53 +00:00
Treehugger Robot
3d8e506c3a Merge "Inclusive fix: Replace sanity to validation in java/sdk.go" 2020-07-28 23:39:20 +00:00
Treehugger Robot
e119a5c554 Merge "Inclusive fix: change the word dummy to fake in zip_test.go" 2020-07-28 23:37:52 +00:00
Treehugger Robot
ebdbfbf539 Merge "Update language to comply with inclusive guidance" am: 9326ba770c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1374702

Change-Id: Iae011adb6146bbe9c43508cef86bc9d80d7621d7
2020-07-28 21:36:33 +00:00
Treehugger Robot
9326ba770c Merge "Update language to comply with inclusive guidance" 2020-07-28 21:21:31 +00:00
Liz Kammer
20ebfb46fc Update language to comply with inclusive guidance
See https://source.android.com/setup/contribute/respectful-code for
reference

Bug: 161896447
Test: m nothing
Change-Id: Ie1d0d63d27f1b1b48680922b7202aa6df04f4696
2020-07-28 11:37:31 -07:00
Patrice Arruda
b481b87104 Inclusive fix: Replace sanity to validation in java/sdk.go
Bug: b/161896447
Test: "lunch 1" and "m nothing"
Change-Id: I8cbdec02dccd961a8cac92c6e957aeebd1e263c1
2020-07-28 18:30:44 +00:00
Patrice Arruda
358d8fd56b Inclusive fix: change the word dummy to fake in zip_test.go
Bug: b/161896447
Test: "lunch 1" and "m nothing"
Change-Id: I1fbc6a1a95101836bff3acb3f5315854f7812fd5
2020-07-28 18:21:10 +00:00
Pirama Arumuga Nainar
bb77ffc496 Merge "[cc/sanitize] Add Blocklist property" am: eda8499a3c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1373516

Change-Id: I30b45c4e164bbeab80f6369f8cfa07ee217ed287
2020-07-28 17:41:44 +00:00
Pirama Arumuga Nainar
eda8499a3c Merge "[cc/sanitize] Add Blocklist property" 2020-07-28 17:21:59 +00:00
Liz Kammer
30de260bee Merge "Add data_native_bins property to java_test_host" am: 8ffde8c9d5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1358802

Change-Id: If104fedc7ad81a604631c44f434f430fdf3a695f
2020-07-28 16:30:29 +00:00
Liz Kammer
8ffde8c9d5 Merge "Add data_native_bins property to java_test_host" 2020-07-28 16:15:56 +00:00
Treehugger Robot
204ffe38e3 Merge "Rename CFI blocklist files." am: 75117fcdd0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1373377

Change-Id: I2259d10186bdbab9e64572ef7f8b05f01a0acbf6
2020-07-28 16:08:27 +00:00
Treehugger Robot
75117fcdd0 Merge "Rename CFI blocklist files." 2020-07-28 15:59:47 +00:00
Yo Chiang
bc2647f97b Merge "Use BaseModuleName() + SubName as apexFile.moduleName" am: 060dc0bea2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1371679

Change-Id: Ia70bf0b7edec8f4c90ca40fa11f5c49d917f6aaf
2020-07-28 11:37:18 +00:00
Yo Chiang
060dc0bea2 Merge "Use BaseModuleName() + SubName as apexFile.moduleName" 2020-07-28 11:27:52 +00:00
Colin Cross
db21367de5 Merge changes from topic "revert-1366377-prebuilt_build_tool_make-RMDAHCHNNX" am: 96d4f4550a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1371195

Change-Id: I9f7dd4dc4edea50b9054a11d6642796882497fc3
2020-07-28 02:07:51 +00:00
Colin Cross
96d4f4550a Merge changes from topic "revert-1366377-prebuilt_build_tool_make-RMDAHCHNNX"
* changes:
  Revert "Add prebuilt_build_tool to allow genrules to use prebuil..."
  Revert "Switch cc's use of bison and flex to prebuilt_build_tool"
  Revert "Fix builds with absolute OUT_DIR"
2020-07-28 01:52:25 +00:00
Kiyoung Kim
b0c5e33791 Merge "Deprecate VNDK-Lite" am: 1b478e57a0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1351464

Change-Id: I25440908f76074664657f70a15f44c3289bd4be4
2020-07-28 00:49:52 +00:00
Kiyoung Kim
1b478e57a0 Merge "Deprecate VNDK-Lite" 2020-07-28 00:36:11 +00:00
Pirama Arumuga Nainar
6c4ccca7b7 [cc/sanitize] Add Blocklist property
This will eventually replace the Blacklist property.

Update language to comply with Android’s inclusive language guidance

See https://source.android.com/setup/contribute/respectful-code for
reference

Bug: 161896447
Bug: 162245450
Test: build topic
Change-Id: I3c2609c791c27b8ba3bcb55f79304b78bce1f518
2020-07-27 13:37:05 -07:00
Pirama Arumuga Nainar
eb8d403273 Rename CFI blocklist files.
Update language to comply with Android’s inclusive language guidance

See https://source.android.com/setup/contribute/respectful-code for
reference

Bug: 161896447
Test: build
Change-Id: I3de274e58135660e102c276a9822a2ef2cd7cba8
2020-07-27 18:37:48 +00:00
Liz Kammer
dd849a81f3 Add data_native_bins property to java_test_host
When multiple os/arch variants are supported, java_test_host could not
find a matching arch due to java having arch:common, whereas native
binaries support a specific architecture. This change adds the property
`data_native_bins` in order to support binaries with the appropriate
os/arch variants.

Test: m FirmwareDtboVerification with data_native_bins
Test: forrest
Bug: 153848038
Change-Id: I45adebff0fde2811d5ef5620c697b97b768c951f
2020-07-27 09:14:06 -07:00
David Su
bec7f53e4f Revert "Add prebuilt_build_tool to allow genrules to use prebuil..."
Revert submission 1366377-prebuilt_build_tool_make

Reason for revert: breaks build
Reverted Changes:
I20bf062bb:Export prebuilt tools to Make
I4bb526492:Move some prebuilt build tool configs to Soong
I195b68813:Support per-module MakeVars
Ibcb257e7b:Fix dependency loop with flex
I6150f0f39:Switch cc's use of bison and flex to prebuilt_buil...
I6939451b8:Reland "Use genrules to build a consistent awk."
Idee60640f:Add prebuilt_build_tool modules for genrule use
I00893172b:Rename bison to bison_bin
I82c26be1c:Add prebuilt_build_tool to allow genrules to use p...

Change-Id: I6b3acf306d355f3e0463564c9ebe9482fa0f609e
2020-07-24 21:25:13 +00:00
David Su
dd18efd95d Revert "Switch cc's use of bison and flex to prebuilt_build_tool"
Revert submission 1366377-prebuilt_build_tool_make

Reason for revert: breaks build
Reverted Changes:
I20bf062bb:Export prebuilt tools to Make
I4bb526492:Move some prebuilt build tool configs to Soong
I195b68813:Support per-module MakeVars
Ibcb257e7b:Fix dependency loop with flex
I6150f0f39:Switch cc's use of bison and flex to prebuilt_buil...
I6939451b8:Reland "Use genrules to build a consistent awk."
Idee60640f:Add prebuilt_build_tool modules for genrule use
I00893172b:Rename bison to bison_bin
I82c26be1c:Add prebuilt_build_tool to allow genrules to use p...

Change-Id: I1ca553ffe4b09250a441b9bc477c3ba98c6f6549
2020-07-24 21:25:00 +00:00
Colin Cross
fae4d517fc Revert "Fix builds with absolute OUT_DIR"
This reverts commit b1d1e0e6bd.

Reason for revert: b/162063775

Change-Id: Ifcdba9d918d2bd0b5ab7ab02ccdc727a844a5556
2020-07-24 20:47:24 +00:00
Ivan Lozano
5f7f043c50 Merge "Add a rust_bindgen_host module type." am: 41b4d79dab
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1371077

Change-Id: I9c4747fd447b9c8b1da13ad59340444528c7246f
2020-07-24 19:13:02 +00:00
Ivan Lozano
6e3a9f7f05 Merge "Enforce correct variant usage for rust_bindgen." am: 264771ce53
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1371076

Change-Id: I6d4287aed75c3eebeceb9a1050739d5cb8ab4be3
2020-07-24 19:12:56 +00:00
Ivan Lozano
41b4d79dab Merge "Add a rust_bindgen_host module type." 2020-07-24 18:53:13 +00:00
Ivan Lozano
264771ce53 Merge "Enforce correct variant usage for rust_bindgen." 2020-07-24 18:41:32 +00:00
Yo Chiang
e812805e75 Use BaseModuleName() + SubName as apexFile.moduleName
This change fixes this error:
```
TARGET module com.android.adbd.flattened requires non-existent TARGET
module: prebuilt_libclang_rt.ubsan_standalone-arm-android
```

apexFile.moduleName is used as Make dependency name, so it should use
m.BaseModuleName() instead of m.Name(), because soong may prepend
"prebuilt_" to or mutate the output of m.Name() in other ways.

android/androidmk.go emits Android.mk modules with
`LOCAL_MODULE := module.BaseModuleName() + <SubName>`, so replace
apexFile.moduleName with BaseModuleName() + <SubName> as much as
possible.

Bug: 7456955
Test: Add unit test in apex/apex_test.go
Test: lunch blueline_hwasan && SANITIZE_TARGET='hwaddress fuzzer' m nothing
Test: Verify out/soong/Android-blueline_hwasan.mk
Change-Id: If8537fc1bedbe6c3405de3662a5df210a073c43f
2020-07-24 20:05:20 +08:00
Treehugger Robot
5388d97b37 Merge "Build transitive lint reports for apex modules" am: 13aa44fc15
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1370779

Change-Id: I9a0fb0f0980701da6c0c837335fc0461bbef6410
2020-07-24 12:03:58 +00:00
Treehugger Robot
13aa44fc15 Merge "Build transitive lint reports for apex modules" 2020-07-24 11:50:39 +00:00
Treehugger Robot
6b3adfad17 Merge "apexDepsMutator uses WalkDeps" am: e8bc288702
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1369776

Change-Id: I0dc292b51099f48af3a0834c88700d1d3b67ace8
2020-07-24 09:46:15 +00:00
Treehugger Robot
e8bc288702 Merge "apexDepsMutator uses WalkDeps" 2020-07-24 09:25:57 +00:00
Dan Willemsen
e3f1644f1f Merge "Fix builds with absolute OUT_DIR" am: e59bf5118d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1372177

Change-Id: I28016af2afd944d35f692c076074f41349729f9d
2020-07-24 09:12:06 +00:00
Dan Willemsen
e59bf5118d Merge "Fix builds with absolute OUT_DIR" 2020-07-24 08:56:18 +00:00
Jooyung Han
b96c02671f Merge "Fix __ANDROID_SDK_VERSION__=0" am: 3992b7c486
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1371677

Change-Id: I9a429cb42d398c6dadc5b33a86964b00e9cf1a01
2020-07-24 02:17:12 +00:00
Jooyung Han
3992b7c486 Merge "Fix __ANDROID_SDK_VERSION__=0" 2020-07-24 02:07:03 +00:00
Dan Willemsen
b1d1e0e6bd Fix builds with absolute OUT_DIR
Test: OUT_DIR=$PWD/out m
Change-Id: I23887110a6ee1228162f9e1a9fc89a97f45ac781
2020-07-23 17:39:12 -07:00
Dan Willemsen
1ab5fe458a Merge "Revert "Support per-module MakeVars"" am: 1a4ab20c1a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1371260

Change-Id: If4706691a86cab45b3c56ddfd5a634ae026ae075
2020-07-23 21:51:24 +00:00
Dan Willemsen
1a4ab20c1a Merge "Revert "Support per-module MakeVars"" 2020-07-23 21:43:04 +00:00
Dan Willemsen
613564eed4 Revert "Support per-module MakeVars"
This reverts commit 2019658b86.

Reason for revert: broke builds where makefiles were using M4 without depending upon it

Change-Id: I18304246e7a8a8f8c2620dd2c65ed77acd256be2
2020-07-23 21:37:35 +00:00
Dan Stoza
e05c751f38 Merge "Add SettingsRoboTests to the allow-list for legacy core/platform API." into stage-aosp-master 2020-07-23 21:36:28 +00:00
Dan Willemsen
bef2696b56 Merge changes from topics "prebuilt_build_tool", "prebuilt_build_tool_make" am: 4ec839a251
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1366377

Change-Id: I1f23af148543b76031cac9f090adac14f330fe24
2020-07-23 21:25:16 +00:00
Dan Willemsen
d97bee1578 Switch cc's use of bison and flex to prebuilt_build_tool am: d2e291ae5c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1366376

Change-Id: I8f28910f1578f3e315ea82c804cdefec6a59d971
2020-07-23 21:25:14 +00:00
Dan Willemsen
402706f2d2 Add prebuilt_build_tool to allow genrules to use prebuilt tools am: 13af8140bc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1364950

Change-Id: Ia88bd5acfbe4afbbb31ceb3c681e1e24de558ec0
2020-07-23 21:25:11 +00:00
Dan Willemsen
4ec839a251 Merge changes from topics "prebuilt_build_tool", "prebuilt_build_tool_make"
* changes:
  Support per-module MakeVars
  Switch cc's use of bison and flex to prebuilt_build_tool
  Add prebuilt_build_tool to allow genrules to use prebuilt tools
2020-07-23 21:10:04 +00:00
Pete Gillin
d5c16eb731 Add SettingsRoboTests to the allow-list for legacy core/platform API.
Bug: 161967461
Test: m SettingsRoboTests
Change-Id: If4e58fba5f74dd06457497c1d131bc1f273f6f5b
2020-07-23 20:47:11 +00:00