Commit Graph

35251 Commits

Author SHA1 Message Date
Treehugger Robot
0c275b92cc Merge "queryview: fix depfile and incrementality." am: afd4c68106
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1657880

Change-Id: I5854748391efa09c3df113f687230e76eb5ac17e
2021-03-30 17:07:09 +00:00
Paul Duffin
b2786a3fdc Merge "Add TestingModule.Outputs" 2021-03-30 16:55:41 +00:00
Paul Duffin
03d56c7743 Merge "Add StringsRelativeToTop" 2021-03-30 16:43:35 +00:00
Paul Duffin
544c368d2e Merge "Add OptionalPath.RelativeToTop" 2021-03-30 16:43:23 +00:00
Paul Duffin
87d3bae657 Merge "Migrate system_modules_test.go from NormalizePathsForTesting" 2021-03-30 16:42:55 +00:00
Paul Duffin
58367574a5 Merge "Add the transitive dependencies of boot_image to apex" 2021-03-30 16:42:07 +00:00
Paul Duffin
da0470d8c7 Merge "Stop JavaSdkLibrary_... tests requiring absolute path" 2021-03-30 16:35:23 +00:00
Paul Duffin
a33da07343 Merge "Remove buildDir from apex package" 2021-03-30 16:30:10 +00:00
Paul Duffin
35b7e1cf23 Merge "Add StringRelativeToTop" 2021-03-30 16:29:34 +00:00
Paul Duffin
8d3c44a986 Merge "Add contents property to boot_image (and prebuilt_boot_image)" 2021-03-30 16:26:20 +00:00
Treehugger Robot
afd4c68106 Merge "queryview: fix depfile and incrementality." 2021-03-30 16:19:56 +00:00
Jingwen Chen
ca0664d2fe bp2build: arch-configurable selects for label list attrs. am: 0702791a99
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1635579

Change-Id: I2e270a69998e52489d25ea221faf79ad02e3f522
2021-03-30 14:58:57 +00:00
Rupert Shuttleworth
4f43fe96bd Store the bp2build module opt-out list as a list instead of a map.
Test: bp2build-sync.py write; bazel build //bionic/...
Change-Id: I3f68f4c62446841aa795bb84161d1fa82510ae9d
2021-03-30 14:13:16 +00:00
Jingwen Chen
0702791a99 bp2build: arch-configurable selects for label list attrs.
This CL adds the configurable LabelListAttribute support to bp2build.

Test: go test
Change-Id: I2ef9e385d9cf1b1845988128eca1d8cda1ecb5e8
2021-03-30 13:22:48 +00:00
Treehugger Robot
018450e83f Merge "bp2build code generator: pretty print zero values" am: 053520a86a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1657879

Change-Id: I00c4a314946a837c9efb57019018d0217118b7f0
2021-03-30 13:18:01 +00:00
Jingwen Chen
58a12b8bae bp2build/queryview: codegen control sequences literally.
See b/184026959 for an instance where a genrule's cmd contains \n, and
the codegenerator generates an applied newline. It should be the
original newline control sequence literal.

Test: TH, bp2build unit test
Fixes: 184026959

Change-Id: Idb99ea87c75dfa4cb3ae679f98d8f61cb5a5ab09
2021-03-30 13:09:42 +00:00
Treehugger Robot
053520a86a Merge "bp2build code generator: pretty print zero values" 2021-03-30 12:54:21 +00:00
Jingwen Chen
e8a8296bc6 queryview: fix depfile and incrementality.
A previous change caused the depfile construction to be incorrect.

Test: run m queryview twice, second run is a no-op.
Fixes: 184026544

Change-Id: Ibaaa97d6a09956e1ca9c48643b0ffad75e44f051
2021-03-30 12:22:12 +00:00
Martin Stjernholm
4d058c8809 Allow dependencies from platform variants to APEX modules.
When `test_for` dependencies are added from libraries to APEX modules,
they can be created from the platform variants of the libraries, since
those are used for building tests. Hence we need an alias from the
platform variant of the APEX module to have a target for those
dependencies.

This is only necessary for libraries that are split by the APEX
mutator, i.e. is a member of some APEX. Normally that's not the case
for test libraries, but there may be exceptions (read
com.android.art.testing).

Test: m nothing
Bug: 183882457
Change-Id: I68affdf69d7ec05c0ee8730e8ec04d7cb9e0e44a
2021-03-30 12:43:45 +01:00
Ulyana Trafimovich
cd6c6ecf3c Merge "Don't fail the build if manifest_check cannot extract targetSdkVersion." am: 23e574fcc4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655687

Change-Id: I0aecbd0d96baf3aca3dde43f547aa65e055a1f20
2021-03-30 11:22:00 +00:00
Martin Stjernholm
99f29d244a Merge changes Iaa6411b5,I2118b8a2,Ibbdd3cbd,I2d1bbda2 am: 38e9f0b82f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652620

Change-Id: I23e6b15e48c54a537338240785d22f008808645c
2021-03-30 11:21:07 +00:00
Ulyana Trafimovich
23e574fcc4 Merge "Don't fail the build if manifest_check cannot extract targetSdkVersion." 2021-03-30 10:34:20 +00:00
Jingwen Chen
fc490bde7e bp2build code generator: pretty print zero values
e.g for zero slices, return the empty list, instead of an empty string.

Test: TH
Change-Id: I7c89d7b0f6ac28d1aa1a76d604173bc99c841a02
2021-03-30 10:30:51 +00:00
Martin Stjernholm
38e9f0b82f Merge changes Iaa6411b5,I2118b8a2,Ibbdd3cbd,I2d1bbda2
* changes:
  Make test_for arch variant.
  Don't use APEX stubs between internal libs in the same APEX when building test_for modules.
  Add FilterListPred.
  Don't panic on "go test" invocations from the command line.
2021-03-30 09:26:36 +00:00
Anton Hansson
f2c7306e15 Merge "Add pom2bp param for default min_sdk_version" am: fa1d64c690
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655692

Change-Id: I087d890c64885726ca1b79be50b6dc14b0a78656
2021-03-30 08:48:24 +00:00
Anton Hansson
fa1d64c690 Merge "Add pom2bp param for default min_sdk_version" 2021-03-30 08:36:26 +00:00
Thiébaud Weksteen
f755fe7017 Merge "bloaty: Append new file extension" am: 2c85c1d605
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655689

Change-Id: Id6e35a6584f4b4c8222cceb273ce2cf3292f08c8
2021-03-30 08:22:18 +00:00
Thiébaud Weksteen
2c85c1d605 Merge "bloaty: Append new file extension" 2021-03-30 07:19:43 +00:00
Bob Badour
d9548315a9 Add license for bloaty subdirectory.
Test: m nothing
Change-Id: I9dc085579757b23d8997b683643546676009b3bc
2021-03-29 23:06:25 -07:00
Colin Cross
3fbf2bea6a Default metalava sandboxing to true
Turn on sandboxing everywhere.

Bug: 153703940
Test: m checkbuild
Change-Id: Ie64913d302efb780d5be9c1b32e6c368d72feba3
2021-03-29 21:57:49 -07:00
Colin Cross
5f6ffc72f7 Add dependencies for Metalava's implicit android.jar references
Metalava implicitly searches
prebuilts/tools/common/api-versions/android-%/android.jar and
prebuilts/sdk/%/public/android.jar when looking for --android-jar-patterns
matches, and fails if it can't find a match for an API level between 1 and
28 in at least one pattern.  Add android.jar files from the
api_levels_annotations_dirs directories to try to satisfy these patterns.

Bug: 153703940
Test: m docs
Change-Id: I866850b33d9a5cd82cc5135bd8f9e9400ed65439
2021-03-29 21:57:49 -07:00
Treehugger Robot
c1f3f6acbc Merge "Append ".static" to ubsan runtime for static binaries" am: e2f39b038d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655969

Change-Id: I0751f20ee8b2064c1e20fc2adf20fca4165fe443
2021-03-30 03:30:13 +00:00
Treehugger Robot
e2f39b038d Merge "Append ".static" to ubsan runtime for static binaries" 2021-03-30 03:07:27 +00:00
Chris Parsons
ad0b5ba42c Refactor cquery processing to generalize transitions
This is a step in the right direction to allow generalized specification
of variant information in the form of configuration transitions, such
that not all transitions must be specified manually. This allows for
much more reasonable addition of new variations in mixed builds.

Test: lunch aosp_flame && USE_BAZEL_ANALYSIS=1 m libc
Change-Id: I95898da06af6d0e3e1f7c073aaf8ec0ebe26c951
2021-03-29 21:14:57 -04:00
Colin Cross
32f1de3327 Append ".static" to ubsan runtime for static binaries
Bug: 183611452
Test: m BUILD_HOST_static=1 tinyplay2
Change-Id: I8d8ef762781f0583c8b9337ce5876c7d3140f665
2021-03-29 16:47:56 -07:00
Eric Holk
406765b15a Do not build stats-log-api-gen-exports in mainline builds
This no longer needs to be a prebuilt since stats-log-api-gen can be
built from proto_logging without extra dependencies.

Test: Treehugger
Bug: 170149255
Change-Id: I6925c2526cee1cbff3ba78bedd7f6c2f58dfff0f
2021-03-29 15:53:32 -07:00
Paul Duffin
d019752f73 Merge "Add dependencies for art boot_image" am: 16e6aeeb51
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652451

Change-Id: I01496b7598af0d61f25c53a3e0f986e559c0c5d5
2021-03-29 21:03:15 +00:00
sophiez
d3e2742ad2 NDK API coverage
Update OWNERS file under build/soong/scripts to include coverage team as owner of related scripts.

Test: TARGET_BUILD_APPS=com.android.adbd m dist apps_only
Change-Id: I6150d5bda0d59828a985cd2ab5dd0aa38a7987c3
2021-03-29 20:29:35 +00:00
Paul Duffin
16e6aeeb51 Merge "Add dependencies for art boot_image" 2021-03-29 20:27:12 +00:00
Ulyana Trafimovich
1012c230b2 Merge "Don't enforce <uses-library> checks if dexpreopt for apps is disabled." am: f682410cbf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655690

Change-Id: I436a5de532d12e7abcebfd898482524a5c896435
2021-03-29 16:57:07 +00:00
Paul Duffin
962783a660 Add TestingModule.Outputs
Needed for some follow up changes.

Bug: 183650682
Test: m nothing
Change-Id: I326e6be6d397f3300be68c1fe069fc72aa736cee
2021-03-29 17:29:30 +01:00
Paul Duffin
0aafcbfd2d Add StringsRelativeToTop
Needed for some follow up changes.

Bug: 183650682
Test: m nothing
Change-Id: Ic14cb4f4592d887dd897989482d540e12065c0fe
2021-03-29 17:29:30 +01:00
Paul Duffin
a5b8135bdf Add OptionalPath.RelativeToTop
Needed for some follow up changes.

Bug: 183650682
Test: m nothing
Change-Id: If38dfe8e919094a7365bcee6cb71bfd0409f4454
2021-03-29 17:29:30 +01:00
Paul Duffin
29888b1bf0 Migrate system_modules_test.go from NormalizePathsForTesting
Bug: 183650682
Test: m nothing
Change-Id: I9ccbbe521a449cb88ab13cde10161a41cfcf244c
2021-03-29 17:29:30 +01:00
Paul Duffin
cf8d7db02b Stop JavaSdkLibrary_... tests requiring absolute path
Bug: 183650682
Test: m nothing
Change-Id: Ia6e5034bbf3920a9e1f8fc319dc722658f6cb1ce
2021-03-29 17:29:30 +01:00
Paul Duffin
37ba344e40 Remove buildDir from apex package
Bug: 182885307
Test: m nothing
Change-Id: I71cbfd79e2fb4b1cbd2914ffab76570548d57c61
2021-03-29 17:29:30 +01:00
Paul Duffin
f53555da2f Add StringRelativeToTop
Needed for some follow up changes.

Bug: 182885307
Test: m nothing
Change-Id: I15992cc11e9c4c0e07af879192220ef1848dd09c
2021-03-29 17:29:30 +01:00
Ulyana Trafimovich
f682410cbf Merge "Don't enforce <uses-library> checks if dexpreopt for apps is disabled." 2021-03-29 16:21:24 +00:00
Paul Duffin
4d101b60f0 Add the transitive dependencies of boot_image to apex
This avoids having to specify boot libraries in both the boot_image
and separately as java_libs on the apex. Simply add them to the
boot_image (happens automatically ATM when using image_name: "art")
and add the boot_image to the apex.

Bug: 177892522
Test: m nothing
Change-Id: I7e0c41665604b73780cdf0dc555067497b1e6ef0
2021-03-29 17:15:29 +01:00
Paul Duffin
82886d6cbf Add contents property to boot_image (and prebuilt_boot_image)
Allows boot_image modules to be created for any module that contributes
to the boot class path, e.g. core-i18n from the com.android.i18n.

A boot_image module with a contents property cannot specify an
image_name, and vice versa. Only those boot_image modules with an
image_name create .art, .oat and .vdex files, either in their
associated APEX or as part of the framework "boot" image.

Bug: 177892522
Test: m nothing
Change-Id: Idfc2bcf00dd6d3ed36ac4df46fcf18e8aa7e2c92
2021-03-29 17:15:27 +01:00