Commit graph

25181 commits

Author SHA1 Message Date
Treehugger Robot
15edee4142 Merge "Remove out/host/common/obj/PACKAGING during installclean" am: 79bb3d4784
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1456350

Change-Id: Ib034c9f5ff97da40cc64582080811490783c3b92
2020-10-12 21:29:34 +00:00
Treehugger Robot
79bb3d4784 Merge "Remove out/host/common/obj/PACKAGING during installclean" 2020-10-12 20:48:09 +00:00
Colin Cross
c5b002874a Merge changes I056c49e6,I994402cb am: 56b6de5847
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1456352

Change-Id: I01795da7f1858739237979e6f8fc9014708d0a24
2020-10-12 20:18:37 +00:00
Colin Cross
56b6de5847 Merge changes I056c49e6,I994402cb
* changes:
  Fix OutputPath.InSameDir example
  Fix go vet error
2020-10-12 20:01:27 +00:00
Jaewoong Jung
460960c457 Merge "Add config.AndroidFirstDeviceTarget." am: 19bc60abee
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1456597

Change-Id: I65eef2bd265e70f2fd1f14176eb9ae03cd7598e9
2020-10-12 17:46:49 +00:00
Jaewoong Jung
19bc60abee Merge "Add config.AndroidFirstDeviceTarget." 2020-10-12 17:30:18 +00:00
Steven Moreland
f45dbe2947 Merge "build/soong/scripts/update-apex-allowed-deps.sh" am: 73a9e603d5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1449397

Change-Id: I46bac2f39e071d89cd4be0483d025d40a3bbcba5
2020-10-12 17:22:07 +00:00
Steven Moreland
73a9e603d5 Merge "build/soong/scripts/update-apex-allowed-deps.sh" 2020-10-12 16:59:24 +00:00
Anton Hansson
1658d4f74f Merge "Make hiddenapi flag generation use new artifact" am: 53781d55bc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1450117

Change-Id: Ie45764ea78e537795c39e2cebd173fadcc294ca2
2020-10-12 16:15:19 +00:00
Anton Hansson
53781d55bc Merge "Make hiddenapi flag generation use new artifact" 2020-10-12 16:08:11 +00:00
Treehugger Robot
345274c970 Merge "Add warning about out-directory usage with RBE builds" am: f43eee4b9b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1453658

Change-Id: Ie3d91d3762ff8f8746fd211005dbe9c1ed2040ee
2020-10-12 15:42:49 +00:00
Treehugger Robot
f43eee4b9b Merge "Add warning about out-directory usage with RBE builds" 2020-10-12 15:25:22 +00:00
Jaewoong Jung
642916f20a Add config.AndroidFirstDeviceTarget.
Targets[Android][0] is not always the first, preferred target. Add a new
field to config to provide the correct target and begin to use it.

Test: m nothing
Test: build/soong/scripts/build-ndk-prebuilts.sh
Fixes: 156980228
Change-Id: Ib56f52424ebf47f3eee6ac62b9fd9eca2919d63a
2020-10-12 14:15:19 +00:00
Anton Hansson
b9da62cb51 Merge "Add a Impl_only_libs prop for sdk_library" am: 858a8cabf9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1455336

Change-Id: Ia7b8f5aa672698a2bea8327980318cf363fd7acb
2020-10-12 09:19:28 +00:00
Anton Hansson
858a8cabf9 Merge "Add a Impl_only_libs prop for sdk_library" 2020-10-12 09:00:13 +00:00
Treehugger Robot
ceb7cbf190 Merge "android/: Rename Plat->SystemExt*SepolicyDirs" am: 6aa958902a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1274762

Change-Id: I526c9060020befbd16e9856b8da2e66ca816ca79
2020-10-12 04:20:11 +00:00
Treehugger Robot
6aa958902a Merge "android/: Rename Plat->SystemExt*SepolicyDirs" 2020-10-12 03:49:24 +00:00
Colin Cross
2ad22c3644 Revert "Make lots of tests run in parallel" am: 405af07859
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1456655

Change-Id: Idc3a771362e3db49d7599f2263a52d2d990cb4e3
2020-10-10 06:56:40 +00:00
Colin Cross
41b4676f44 Fix OutputPath.InSameDir example
The OutputPath.InSameDir example was called FileInSameDir.

Test: go vet ./android
Change-Id: I056c49e6b39f6124b0fa32ebc3498a2fe42c8ddc
2020-10-10 03:04:09 +00:00
Colin Cross
ff0278b32a Fix go vet error
stderr is a bytes.Buffer, but the String() method has a pointer
receiver, so stderr does not satisify the Stringer interface
and can't be used for a %s argument.  Make stderr a *bytes.Buffer
instead.

Test: go vet ./android
Change-Id: I994402cb954946279375c9d447ad3854380381cc
2020-10-10 03:03:54 +00:00
Colin Cross
3e6f67a68b Remove out/host/common/obj/PACKAGING during installclean
Tradefed packages are created in out/host/common/obj/PACKAGING
and should be removed during installclean so that they get an
accurate embedded build number.

Fixes: 170308394
Test: treehugger
Change-Id: Ib7a57377b5c9512584bc93f10da316eadf786979
2020-10-10 03:03:38 +00:00
Colin Cross
405af07859 Revert "Make lots of tests run in parallel"
This reverts commit 323dc60712.

Reason for revert: Possible cause of test instability
Bug: 170513220
Test: soong tests

Change-Id: Iee168e9fbb4210569e6cffcc23e60d111403abb8
2020-10-09 18:34:24 -07:00
Treehugger Robot
91d57dd066 Merge "Global ThinLTO: opt out vndk binaries as a workaround" am: 6682ef42a4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1456235

Change-Id: If321871406c2ea2f823f05173480888cf5ffe8b4
2020-10-09 19:16:09 +00:00
Treehugger Robot
6682ef42a4 Merge "Global ThinLTO: opt out vndk binaries as a workaround" 2020-10-09 19:00:42 +00:00
Treehugger Robot
1ce902558f Merge "Revert "Implement vts_config module"" am: 38cfe29597
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1451110

Change-Id: I1ca6f5347a5c6180f52f1a4dd14045637ece5c09
2020-10-09 17:55:00 +00:00
Treehugger Robot
38cfe29597 Merge "Revert "Implement vts_config module"" 2020-10-09 17:25:35 +00:00
Christopher Parsons
03f233c372 Merge "Mixed bazel/soong build prototype for genrule" am: c8f84809ad
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1441107

Change-Id: Id68d377e339684f9a16d5c73c0f3d4c641f64299
2020-10-09 14:42:54 +00:00
Christopher Parsons
c8f84809ad Merge "Mixed bazel/soong build prototype for genrule" 2020-10-09 14:27:04 +00:00
Yi Kong
134161f7e5 Global ThinLTO: opt out vndk binaries as a workaround
With global ThinLTO enabled, vndk version has different symbol ordering
from the platform version. Opt out any binaries that has vndk enabled as
a temporary workaround.

Test: GLOBAL_THINLTO=true m
Bug: 169217596
Change-Id: I75b060cbe6c74421d283c6dfbd669af20f466d1f
2020-10-09 22:08:11 +08:00
Anton Hansson
7f66efa10c Add a Impl_only_libs prop for sdk_library
Similar to Stubs_only_libs, this allows being a bit more specific
about what libs compile against what. In my usecase, it allows
removing a platform dependency from the appsearch stubs, which allows
the platform to depends on the stubs.

Bug: 169304493
Test: m
Change-Id: Ie997462819cd5266a761b2d415e81806c7877967
Merged-In: Ie997462819cd5266a761b2d415e81806c7877967
2020-10-09 13:49:30 +01:00
Thiébaud Weksteen
6f8494caf8 Merge "rust: refactor tests setup" am: 43977e8d0e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1454815

Change-Id: Ida3b2650bf02d10a739f5ce0fd510716a84ba146
2020-10-09 12:26:39 +00:00
Thiébaud Weksteen
43977e8d0e Merge "rust: refactor tests setup" 2020-10-09 12:13:15 +00:00
Joe Onorato
fc8ab60603 Refactor OWNERS files in platform/build/soong. am: a80b480eea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1455169

Change-Id: I7b794896884a4f11e5203817b814223ec09e69d8
2020-10-09 04:45:30 +00:00
Chris Parsons
f3c96efea4 Mixed bazel/soong build prototype for genrule
With this change, bazel_module is a specifiable property on
genrule module definitions. With bazel-enabled mode, soong_build will
defer to Bazel for information on these modules.

source build/soong/bazelenv.sh to enter bazel-enabled mode.

Test: Manually verified on bionic/libc genrules using aosp_cf_x86_phone-userdebug
Change-Id: I3619848186d50be7273a5eba31c79989b981d408
2020-10-08 22:46:23 -04:00
Joe Onorato
a80b480eea Refactor OWNERS files in platform/build/soong.
Pulls out all of the per-file rules into their relevant directories
so platform/build/soong:/OWNERS can be included everywhere we need
the list of build system owners.

Test: treehugger
Bug: 170407947
Change-Id: I5a4b2d252bd9b3c280cd9954cf0e65ac21153ede
2020-10-08 16:14:32 -07:00
Dan Shi
ee0b81a4fe Revert "Implement vts_config module"
This reverts commit ff36da04e8.

Reason for revert: remove vts10 harness and build configs
Bug: 169581727
Bug: 166662663
Test: build

Change-Id: I090b41c99c2279d24f08e4343289cbdcc7934f5d
2020-10-08 10:38:08 -07:00
Thiébaud Weksteen
0a75e52460 rust: refactor tests setup
Move to a builder pattern to increase flexibility when generating the
test configuration. The testRust, testRustCov and testRustError are kept
as main entry points for standard tests. Add documentation.

Test: m nothing
Change-Id: I891bec982ff2d65413f150d2395edf0fb0d68a43
2020-10-08 15:51:10 +02:00
Kousik Kumar
a0a44a84be Add warning about out-directory usage with RBE builds
Prints the following warning messsage:
WARNING:
Setting OUT_DIR to a path other than out may result in slow RBE builds.
See http://go/android_rbe_out_dir for a workaround.

Bug: b/169676232
Change-Id: Id1ad06c4dc672c24373642e0b624833eb6a0dbcf
2020-10-08 02:50:24 -04:00
Treehugger Robot
df0998def7 Merge "Add android.system.keystore2-unstable-ndk_platform to vndk.go" am: 36e4ad1f4d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1443716

Change-Id: I4fb7b21c17c17f3810dc29739b748719b07bca08
2020-10-07 21:14:34 +00:00
Colin Cross
e81d9e0142 Merge "Make lots of tests run in parallel" am: 45fd6ace7e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1439471

Change-Id: I96efe7e57e1c446082b488d0b026d0f17eadb229
2020-10-07 21:13:34 +00:00
Treehugger Robot
36e4ad1f4d Merge "Add android.system.keystore2-unstable-ndk_platform to vndk.go" 2020-10-07 20:45:52 +00:00
Colin Cross
45fd6ace7e Merge "Make lots of tests run in parallel" 2020-10-07 20:40:38 +00:00
Colin Cross
21bb1d491c Merge "Remove global state from apex modules" am: 43159bd1b7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1428815

Change-Id: I9ddb389c6a107e7431ba761c58b0ab99048fbc11
2020-10-07 19:05:15 +00:00
Colin Cross
43159bd1b7 Merge "Remove global state from apex modules" 2020-10-07 17:58:00 +00:00
Paul Duffin
d8c90a7e8d Merge "Allow access to the class jar for java_import using {.jar} tag" am: a87ea4587d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1450820

Change-Id: I32200cbb541524bd73ba6695ace4b21162914529
2020-10-07 17:30:59 +00:00
Paul Duffin
a87ea4587d Merge "Allow access to the class jar for java_import using {.jar} tag" 2020-10-07 17:16:43 +00:00
Tom Cherry
320a70915c Merge "Reland: "Include system/core/liblog/include instead of using symlinks"" am: a5e9be9476
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1451057

Change-Id: Id25b73231d03002301bd34e6e9127b26bf442404
2020-10-07 15:38:09 +00:00
Tom Cherry
a5e9be9476 Merge "Reland: "Include system/core/liblog/include instead of using symlinks"" 2020-10-07 15:11:10 +00:00
Anton Hansson
b3cbd61846 Make hiddenapi flag generation use new artifact
Use the output of new genrule combined-removed-dex instead of the
removedDexApi output from various metalava runs when generating the
hiddenapi-flags.csv file.

There are some minor difference in the two combined-removed-dex files,
but these diffs do not amount to any diffs in the generated
hiddenapi-flags.csv file. See the full set of diffs here:
https://paste.googleplex.com/6632343525654528

Bug: 158465496
Test: diff hiddenapi-flags.csv before and after
Change-Id: I082d18fc2b8a57ea8c5941d5c955a7970ab9d860
2020-10-07 12:28:23 +01:00
Anton Hansson
c9e7c18c40 Merge "Add outputfiles tags for droidstubs api txts" am: 70bc545407
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1446800

Change-Id: Ib526b1cb47f0900900cb028011c864eb77e192c4
2020-10-07 10:00:19 +00:00