Commit Graph

34818 Commits

Author SHA1 Message Date
Treehugger Robot
1537692837 Merge "Do not exclude VNDK modules from SoC/Product-specific modules" 2020-10-20 00:02:36 +00:00
TreeHugger Robot
d16d8a44be [automerger skipped] Merge "resolve merge conflicts of e32b384719 to rvc-dev" into rvc-dev am: 7790f714d5 am: b0c70846ae am: 3f905b3871 -s ours am: d2f3ece3f1 -s ours
am skip reason: Change-Id Ib6898b49c16a830d814efe74581bde463caedf76 with SHA-1 4cf6845f41 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12851151

Change-Id: Ia75398e78b56cf70e01b82f934038e4ee0c16b24
2020-10-19 20:53:12 +00:00
TreeHugger Robot
7dc5b20ab5 [automerger skipped] Merge "resolve merge conflicts of e32b384719 to rvc-dev" into rvc-dev am: 7790f714d5 am: b0c70846ae -s ours am: c3a1b9e642 -s ours am: 28ed47b4a4 -s ours
am skip reason: Change-Id Ib6898b49c16a830d814efe74581bde463caedf76 with SHA-1 4cf6845f41 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12851151

Change-Id: I4e2dd90c23ed92c14d9e21821fcd1b318ea00cfa
2020-10-19 20:52:57 +00:00
Martin Stjernholm
9368834f8d Assume 32-bit ARM has Neon support in Mainline module SDKs.
Test: build/soong/scripts/build-aml-prebuilts.sh libz
Bug: 171071637
Change-Id: If123de2f8835a0cd2b7831f32d881e09a5a9c6df
2020-10-19 21:49:04 +01:00
TreeHugger Robot
d94295c2c5 [automerger skipped] Merge "resolve merge conflicts of e32b384719 to rvc-dev" into rvc-dev am: 7790f714d5 am: ea8c619eb8 -s ours
am skip reason: Change-Id Ib6898b49c16a830d814efe74581bde463caedf76 with SHA-1 4cf6845f41 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12851151

Change-Id: I25f62112ee7eaa72874d22ebd7989d4c420a2cf1
2020-10-19 20:45:51 +00:00
Liz Kammer
8305feceec resolve merge conflicts of 0f35aeec67 to mainline-prod am: cb7c5b4ea7
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12864058

Change-Id: I62f0fe3ef3684fc29ba19189fe28ae5f75d5cd7f
2020-10-19 20:45:06 +00:00
TreeHugger Robot
d2f3ece3f1 [automerger skipped] Merge "resolve merge conflicts of e32b384719 to rvc-dev" into rvc-dev am: 7790f714d5 am: b0c70846ae am: 3f905b3871 -s ours
am skip reason: Change-Id I3e5d64f948ae43c5dda60de1d4a52b187e36dff8 with SHA-1 af7b75b8db is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12851151

Change-Id: I10e48d69dd2f1cd1c66ed4ffc421aac5e508bea2
2020-10-19 20:44:45 +00:00
TreeHugger Robot
28ed47b4a4 [automerger skipped] Merge "resolve merge conflicts of e32b384719 to rvc-dev" into rvc-dev am: 7790f714d5 am: b0c70846ae -s ours am: c3a1b9e642 -s ours
am skip reason: Change-Id I3e5d64f948ae43c5dda60de1d4a52b187e36dff8 with SHA-1 4fb8adcc4c is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12851151

Change-Id: Iefc01d9b6a2044201a66ea667fe2599b06366503
2020-10-19 20:44:33 +00:00
TreeHugger Robot
ea8c619eb8 Merge "resolve merge conflicts of e32b384719 to rvc-dev" into rvc-dev am: 7790f714d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12851151

Change-Id: I5202c317eb520761e7c556518cc7dceede749c3d
2020-10-19 20:34:37 +00:00
TreeHugger Robot
3f905b3871 Merge "resolve merge conflicts of e32b384719 to rvc-dev" into rvc-dev am: 7790f714d5 am: b0c70846ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12851151

Change-Id: If1fbc8f73c6fb4a2a61a16b9fcaa19323d535acb
2020-10-19 20:34:17 +00:00
Liz Kammer
f9e5c3b799 Add android app property rename_resources_package
This relands I70a43c2163709afc90262d74f975ce14a556cf55 with a property
to disable renaming of the package in resource files to support
compatibility with packages that would be infeasible to change without
causing failures.

When rename_resources_package is true, uses aapt2 flag to change the
package name encoded in the resources table for override apps.

Test: app_test.go
Bug: 147434671
Merged-In: I3a051ddeb5979f9c0838d176656a1b5cf2677a9b
Change-Id: I3a051ddeb5979f9c0838d176656a1b5cf2677a9b
2020-10-19 20:34:05 +00:00
TreeHugger Robot
c3a1b9e642 [automerger skipped] Merge "resolve merge conflicts of e32b384719 to rvc-dev" into rvc-dev am: 7790f714d5 am: b0c70846ae -s ours
am skip reason: Change-Id I3e5d64f948ae43c5dda60de1d4a52b187e36dff8 with SHA-1 4fb8adcc4c is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12851151

Change-Id: Ie9eefae48844eb070e266955b37b755c5b7d0298
2020-10-19 20:33:49 +00:00
Liz Kammer
061dd0519d Merge "Error if visibility specifies a module" am: e72e1ff98b am: 03e459df64 am: 4a8022a81f am: 3413f1a714
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1462686

Change-Id: Ifd96b8583d0dc2dbc76526eb75cf8324e1b2042c
2020-10-19 19:57:30 +00:00
TreeHugger Robot
b0c70846ae Merge "resolve merge conflicts of e32b384719 to rvc-dev" into rvc-dev am: 7790f714d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12851151

Change-Id: I0b4a0274e5a8a78d2d8c5ad5359534a25135e4bf
2020-10-19 19:57:28 +00:00
TreeHugger Robot
7790f714d5 Merge "resolve merge conflicts of e32b384719 to rvc-dev" into rvc-dev 2020-10-19 19:47:37 +00:00
Liz Kammer
3413f1a714 Merge "Error if visibility specifies a module" am: e72e1ff98b am: 03e459df64 am: 4a8022a81f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1462686

Change-Id: Ib6f0d48c40596480b8542ef4292e98d7a81e940a
2020-10-19 19:46:30 +00:00
Martin Stjernholm
ea581fc95d Move the intermediate directory for ART boot images.
Free up the directory $(PRODUCT_OUT)/apex/com.android.art for the
release ART APEX. Without this we'll get conflicting install paths in
make.

Test: build/soong/soong_ui.bash --make-mode \
    TARGET_PRODUCT=sdk_x86_64 TARGET_BUILD_VARIANT=userdebug nothing
  with http://r.android.com/q/topic:release-apex-rename+author:mast
  present to rename the ART release APEX to com.android.art.
Test: Build & boot on CF
Test: apct/device_boot_test and asit/perf/boottime_test on
  blueline_jitzygote-userdebug
Test: avd/avd_boot_health_check on cf_x86_phone-userdebug_coverage_art
Bug: 169639321
Change-Id: I0b263d5922d438834e5c804e55f69a2a1421ab73
Merged-In: I0b263d5922d438834e5c804e55f69a2a1421ab73
2020-10-19 20:42:46 +01:00
Steven Moreland
25281087a9 Update VNDK version for common graphics HALs.
We are adding things to them, and in order for core libraries like libui
to use them, the newer versions need to be in the VNDK.

Bug: 170435409
Test: build
Change-Id: I97f26b78758f2eed128fc46db03b5f6ba3f2245f
2020-10-19 19:35:01 +00:00
Liz Kammer
4a8022a81f Merge "Error if visibility specifies a module" am: e72e1ff98b am: 03e459df64
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1462686

Change-Id: I773bf92264a1993087d1d4fa105b51cad2952f3f
2020-10-19 19:33:53 +00:00
Liz Kammer
03e459df64 Merge "Error if visibility specifies a module" am: e72e1ff98b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1462686

Change-Id: If6f6f1b7a6cf32682d2737a4c0620efcdc0ffc59
2020-10-19 19:19:45 +00:00
Liz Kammer
e72e1ff98b Merge "Error if visibility specifies a module" 2020-10-19 19:06:49 +00:00
Jooyung Han
83ded7781d Merge "Move tradefed_binary.go into subdir" am: 18e990ec1d am: d34abd2e88 am: 809ed3a0a9 am: 1511f08fd5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1465903

Change-Id: I7bd84ef0955b672ed11c9e2836b7b36194e31805
2020-10-19 19:00:07 +00:00
Jooyung Han
1511f08fd5 Merge "Move tradefed_binary.go into subdir" am: 18e990ec1d am: d34abd2e88 am: 809ed3a0a9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1465903

Change-Id: I26c0e2b13adc7b4bb44d2df5cb0c911dc4d70421
2020-10-19 18:15:06 +00:00
Patrice Arruda
a24c3479a8 resolve merge conflicts of e32b384719 to rvc-dev
Test: I solemnly swear I tested this conflict resolution.
Bug: b/169395325
Change-Id: Iaac2f8ef4b452c95bdc4584697c3e4e9ed69aa5c
Merged-In: Ib6898b49c16a830d814efe74581bde463caedf76
Merged-In: I3e5d64f948ae43c5dda60de1d4a52b187e36dff8
2020-10-19 18:09:54 +00:00
Jooyung Han
809ed3a0a9 Merge "Move tradefed_binary.go into subdir" am: 18e990ec1d am: d34abd2e88
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1465903

Change-Id: I69c73b7006f3f7cdf9b66043084fc2b6d657d860
2020-10-19 18:02:02 +00:00
Jooyung Han
d34abd2e88 Merge "Move tradefed_binary.go into subdir" am: 18e990ec1d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1465903

Change-Id: Ia0ca3251f72425a11b2fa79357ec030f35e85197
2020-10-19 17:49:03 +00:00
Jooyung Han
18e990ec1d Merge "Move tradefed_binary.go into subdir" 2020-10-19 17:31:20 +00:00
Liz Kammer
56f2280132 Merge "Expand visiblity error" am: b51d6d13a8 am: 15df2f2c5d am: b11d4b848d am: b64f161cec
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1462691

Change-Id: I114117982bac35936a32923ba3ee6f0711cbfbd4
2020-10-19 16:12:51 +00:00
Liz Kammer
b64f161cec Merge "Expand visiblity error" am: b51d6d13a8 am: 15df2f2c5d am: b11d4b848d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1462691

Change-Id: Iad22fd33ce949d65b913fd9db6609c5923bcc175
2020-10-19 15:59:55 +00:00
Liz Kammer
b11d4b848d Merge "Expand visiblity error" am: b51d6d13a8 am: 15df2f2c5d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1462691

Change-Id: Id25374d336f1139cddeb1cdca34e0233ebef9a9c
2020-10-19 15:42:58 +00:00
Liz Kammer
15df2f2c5d Merge "Expand visiblity error" am: b51d6d13a8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1462691

Change-Id: I8824c97bd607c58e2b71a456bdeb05f2941043a8
2020-10-19 15:26:08 +00:00
Liz Kammer
b51d6d13a8 Merge "Expand visiblity error" 2020-10-19 15:01:09 +00:00
Jingwen Chen
311bd38082 Bazel overlay: write all .bzl files in <bazel_overlay>/build/bazel/overlay_rules directory
This keeps the top level directory clean, and leverages the
new "build/bazel" repo location / package path.

Test: m bazel_overlay && cd out/soong/bazel_overlay && bazel cquery //...

Bug: 171180724

Fixes: 171180724
Signed-off-by: Jingwen Chen <jingwen@google.com>
Change-Id: I151b8f3d2177167711e5974e5eabad8d6e910276
2020-10-19 07:59:46 -04:00
Slava Shklyaev
7f0c05539f Add new neuralnetworks targets to apex/allowed_deps.txt
Generated with build/soong/scripts/update-apex-allowed-deps.sh

Bug: 160669906
Test: m
Change-Id: Ifd056230dd352fe3fa1c462d1e090aef5bbeb09d
2020-10-19 12:15:11 +01:00
Jooyung Han
479ca17bb1 run vndk-sp closure check before double-loadable
If vndk-sp closure fails, the error message mentions it instead of
double-loadable error. It would be more helpful since vndk-sp is more
straightforward to fix.

Bug: 171080110
Test: m (soong test added)
Change-Id: Icc762a4ffb4a8d7d6b31ef1daac17f13383518bf
2020-10-19 18:57:45 +09:00
Kousik Kumar
b328f6dc85 Deprecate both USE_GOMA and FORCE_USE_GOMA flags
Test:
m USE_GOMA=true GOMA_DIR=$(goma_ctl goma_dir) toybox
m FORCE_USE_GOMA=true GOMA_DIR=$(goma_ctl goma_dir) toybox
both result in error message being printed.

Change-Id: I94ccaf217dba71aca990d88d205bad669a49a2f5
2020-10-19 01:48:23 -04:00
Jingwen Chen
ce679d29ec Add symlink_outputs support to Soong.
This CL adds symlink_outputs to various locations in Soong that creates
actions that creates symlink outputs, and explicitly mark them as such.

Test: m
Bug: 160568334
Change-Id: I322751bada52a9f49011c74731d84761586e03e7
2020-10-19 01:26:50 -04:00
Jooyung Han
1e611b858f Move tradefed_binary.go into subdir
Having two packages in the same directory makes it harder for go tools
to understande the directory structure.

For example, in build/soong, "go test ./cc/..." fails with cyclic
package imports.

Bug: n/a
Test: go test ./cc/... (in build/soong)
Change-Id: I7a040bf30b1e001680dd43fed9747e9651372274
2020-10-19 01:55:06 +00:00
Inseob Kim
67be732de1 Set flag exporter provider for vendor snapshots
Also, TestVendorSnapshotUse is amended so it can test whether vndk
snapshot and vendor snapshot modules export their flags correctly.

Bug: N/A
Test: manual test
Change-Id: Ie62ad1206449b1a40db8a2282af00616db693017
2020-10-19 10:15:28 +09:00
Treehugger Robot
9a32b73512 Merge "Set flag exporter provider for vndk_prebuilt libs" am: 509a9d35ac am: 85e95f70a0 am: 0ba02d9ae8 am: 0598680dea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1463642

Change-Id: I30baa389f92ae2667663e534cb5f1dff3ff6470f
2020-10-18 13:41:01 +00:00
Treehugger Robot
0598680dea Merge "Set flag exporter provider for vndk_prebuilt libs" am: 509a9d35ac am: 85e95f70a0 am: 0ba02d9ae8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1463642

Change-Id: I938032bd09e91153391046ec1ae3d692630a9e8c
2020-10-18 13:28:52 +00:00
Treehugger Robot
0ba02d9ae8 Merge "Set flag exporter provider for vndk_prebuilt libs" am: 509a9d35ac am: 85e95f70a0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1463642

Change-Id: I795d959ac3cae23d9d55148b48c908c229947375
2020-10-18 13:02:28 +00:00
Treehugger Robot
85e95f70a0 Merge "Set flag exporter provider for vndk_prebuilt libs" am: 509a9d35ac
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1463642

Change-Id: Ia17fa272bda5bc9e647b9c8f31574471fc98333e
2020-10-18 12:30:48 +00:00
Treehugger Robot
509a9d35ac Merge "Set flag exporter provider for vndk_prebuilt libs" 2020-10-18 12:19:05 +00:00
Justin Yun
543f60bc31 Do not exclude VNDK modules from SoC/Product-specific modules
The VNDK modules were excluded from SoC/Product specific modules
because they were installed to system partition. However, as they
moved to VNDK APEX, we don't need to make a exception for VNDK
modules.

Bug: 170711679
Test: Follow the steps below:
$ lunch aosp_x86-eng
$ m nothing # ctrl-C while running soong_build
$ rm out/soong/.soong.in_make
$ m --skip-make libc

Change-Id: I001bc98e4031e5e8bcdea9cb920caa21b8744752
2020-10-18 02:06:48 +00:00
Liz Kammer
cb7c5b4ea7 resolve merge conflicts of 0f35aeec67 to mainline-prod
Change-Id: If7d2d63979907e9658dc742a7af5a8056f9e54c6
2020-10-16 22:41:31 +00:00
Julien Desprez
1c1d74c5e7 Merge "Add the Tradefed binary (suite) rules to soong" am: 34f0290582 am: b1c6f59282 am: 9884261b38 am: 74d89a36da
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1463105

Change-Id: I35ad875941b82b655271bd2369fcfa5f72f8e9ba
2020-10-16 21:33:55 +00:00
Julien Desprez
74d89a36da Merge "Add the Tradefed binary (suite) rules to soong" am: 34f0290582 am: b1c6f59282 am: 9884261b38
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1463105

Change-Id: I656f99a6d7f2f971b451f533a796fd9f44588757
2020-10-16 21:12:28 +00:00
Julien Desprez
9884261b38 Merge "Add the Tradefed binary (suite) rules to soong" am: 34f0290582 am: b1c6f59282
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1463105

Change-Id: Ic12aa23a06f9dd232117c0fdb0372a3be4741a8d
2020-10-16 20:27:54 +00:00
Julien Desprez
b1c6f59282 Merge "Add the Tradefed binary (suite) rules to soong" am: 34f0290582
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1463105

Change-Id: I36fb17ee6db5ee6bea294fabc4d2e0e417fdc685
2020-10-16 20:06:01 +00:00