Commit Graph

3459 Commits

Author SHA1 Message Date
Chris Parsons
474690cecd Skip unnecessary repeititon in validation am: a66c0b5900 am: 962c7e0f49
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1776525

Change-Id: Id7283a576664ac31e0fbcbe805608d1bc0fba23a
2021-07-23 21:25:50 +00:00
Chris Parsons
a66c0b5900 Skip unnecessary repeititon in validation
Test: Unit tests
Change-Id: I492d3157b1dee358871924071b26a73e8b83a9a5
2021-07-23 17:23:29 +00:00
Christopher Parsons
b46b416998 Merge "Remove bp2build deps mutator" am: 2f1102fe58 am: ba5164965a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1774225

Change-Id: Ief47750896b9ffca5ac375e841288e1b7da8cca0
2021-07-23 15:22:52 +00:00
Colin Cross
1dd4b94aa3 Merge "Remove Fuchsia support from Soong" am: b8d69871a8 am: be588a31d1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1774379

Change-Id: I9e0151ef36eb011f8c942469ca50eff0b781faf6
2021-07-23 15:22:42 +00:00
Christopher Parsons
2f1102fe58 Merge "Remove bp2build deps mutator" 2021-07-23 14:55:40 +00:00
Colin Cross
b8d69871a8 Merge "Remove Fuchsia support from Soong" 2021-07-23 14:54:49 +00:00
Treehugger Robot
03ea76a685 Merge "Reland "Add TestArchProperties"" am: 65eb794a5a am: e72d6203b2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1775372

Change-Id: I1c676532f0a88fa8499384090c9ac0835fec4629
2021-07-23 13:10:34 +00:00
Treehugger Robot
65eb794a5a Merge "Reland "Add TestArchProperties"" 2021-07-23 12:42:15 +00:00
Chang Li
ee34414579 Allowlist external/libtextclassifier for sdk_variant_only. am: 66d3cb727f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15358458

Change-Id: I53d08ab7f326c8fa78e2406c774b5b2280ce76ae
2021-07-23 09:44:06 +00:00
Colin Cross
94f63038e3 Merge "Revert "Add TestArchProperties"" am: f8c466633f am: 0629047dd5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1775371

Change-Id: I99bbc4cea9e033dcde05597cce18d8e1c37ea967
2021-07-23 00:41:02 +00:00
Colin Cross
c539182b79 Merge "Add TestArchProperties" am: 4e1d5dd083 am: 95f1bfaae3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1773051

Change-Id: Ic5c64e9c9635ecc3ba097684e1b2849511eadcdf
2021-07-23 00:40:51 +00:00
Colin Cross
acf474e9bb Merge "Replace android.BuildOs with Config.BuildOS" am: 78fd15f7d6 am: bf2f93f8e8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1773108

Change-Id: Ib6e5eea644f359c59e597943222d3f1f51b564d0
2021-07-23 00:39:59 +00:00
Colin Cross
4e87990cf2 Reland "Add TestArchProperties"
Add a test that verifies appropriate arch properties are squashed
into each variant.

This relands I4a5044f3b2b3ca0a51dc457dec7157411ebad7e3 with a fix for the darwin test.

Test: TestArchProperties
Change-Id: I7e71eb839856c7121c60713c480df09f30f3cd7c
2021-07-23 00:21:00 +00:00
Colin Cross
f8c466633f Merge "Revert "Add TestArchProperties"" 2021-07-23 00:18:28 +00:00
Colin Cross
239de0ac22 Revert "Add TestArchProperties"
This reverts commit 34c32fabea.

Reason for revert: broke mac build

Change-Id: Ibe9d854f65e5ae109ba690e878946e212016434f
2021-07-23 00:17:54 +00:00
Colin Cross
4e1d5dd083 Merge "Add TestArchProperties" 2021-07-23 00:07:14 +00:00
Colin Cross
78fd15f7d6 Merge "Replace android.BuildOs with Config.BuildOS" 2021-07-23 00:07:01 +00:00
Chris Parsons
5a34ffb350 Remove bp2build deps mutator
Refactor bp2build to retrieve modules directly by name, instead of via
DirectDeps. This functions properly as bp2build has no need for variant
information of the blueprint graph.

Test: USE_BAZEL_ANALYSIS=1 m fmtlib
Change-Id: Ief4b67bc56f24929871af772f3a742f07085bf8c
2021-07-22 18:09:34 -04:00
Chang Li
66d3cb727f Allowlist external/libtextclassifier for sdk_variant_only.
Bug: 166040889
Change-Id: If8a9d916dada116f52fd84194fa42e9179526b2c
2021-07-22 09:42:33 +00:00
Colin Cross
cb0ac95bde Remove Fuchsia support from Soong
Bug: 194215932
Test: m checkbuild
Change-Id: Id7d3964d9417f8b0938af9b168bb4c00cebe9390
2021-07-21 20:37:46 -07:00
Kiyoung Kim
52b6b4a768 Merge changes I3574d2a1,Ifb69fb3d am: 5d96f64d04 am: 6a7257a450
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1771025

Change-Id: I39bdfdbd3ffe8e9471b54480f557206ec93a3e26
2021-07-22 01:30:55 +00:00
Kiyoung Kim
5d96f64d04 Merge changes I3574d2a1,Ifb69fb3d
* changes:
  Update prebuilt_etc available for snapshot
  Separate snapshot definition
2021-07-22 00:57:39 +00:00
Treehugger Robot
2fe7628fad Merge "AOSP Music to bazel: path added to bazel.go" am: f8de870f4c am: fe324bea73
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1773505

Change-Id: I77e6b9b4bfccbef0431d0230b5ca869226644777
2021-07-21 22:28:47 +00:00
Colin Cross
34c32fabea Add TestArchProperties
Add a test that verifies appropriate arch properties are squashed
into each variant.

Test: TestArchProperties
Change-Id: I4a5044f3b2b3ca0a51dc457dec7157411ebad7e3
2021-07-20 16:46:30 -07:00
Damian Patel
8b22219066 AOSP Music to bazel: path added to bazel.go
In order to reconcile the mixed builds between
Soong and Bazel, the path for the AOSP Music
BUILD file must be added to the bp2buildKeepExistingBuildFile
map.

Change-Id: Ib895d0f4a09502da2d33fc673026d91269b4d086
2021-07-20 20:41:14 +00:00
Colin Cross
0c66bc615b Replace android.BuildOs with Config.BuildOS
Replace the android.BuildOs constant with Config.BuildOS so that it
can vary based on the product config.

Bug: 190084016
Test: all Soong tests
Change-Id: Ia67f872d8b2ab788747a22e3a9659dc21c9775cd
2021-07-20 12:46:48 -07:00
Kiyoung Kim
ae11c233b5 Update prebuilt_etc available for snapshot
Make prebuilt_etc module available for the snapshot. This change
includes implementing snapshot interface for the prebuilt_etc module so
it can be added to the snapshot from the fake snapshot, or when the
module is specified in the list.

Bug: 192430376
Test: m nothing passed
Test: Checked if the module is included in the snapshot properly
Change-Id: I3574d2a1b8f8f4e5f083f3913e8768f5088d0c46
2021-07-20 11:24:03 +09:00
Liz Kammer
62f2a84b20 Merge "Handle target.bionic in bp2build." am: 2d8056929e am: 16cca436e4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1770015

Change-Id: Ic6807fe44cdafd37b62a3da951409d1ae66597db
2021-07-19 18:40:08 +00:00
Liz Kammer
2d8056929e Merge "Handle target.bionic in bp2build." 2021-07-19 18:10:24 +00:00
Liz Kammer
01a16e8275 Handle target.bionic in bp2build.
Soong supports some hand-crafted target.<type> that match multiple os or
arch types to simplify configuring for similar targets. target.bionic is
used to match on both android and linux_bionic OSes for cases where they
should be handled the same way.

Test: build/bazel/ci/bp2build.sh
Change-Id: I47b6aaf3279e4d242c4fd0e12f24117eb98e0665
2021-07-19 12:53:58 +00:00
Treehugger Robot
6631e0e332 Merge "Revert "Export implementation class jars for java_boot_libs"" am: 52cc87959b am: a868f0ff32
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1768945

Change-Id: Iead370d014ec0c650538fa589b5011719d4dbd17
2021-07-19 10:26:42 +00:00
Treehugger Robot
52cc87959b Merge "Revert "Export implementation class jars for java_boot_libs"" 2021-07-19 09:49:17 +00:00
Jingwen Chen
5c2e25258a Merge "Fix apex bp2build." am: 8bdc1bb3d7 am: d3f17aed08
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1769290

Change-Id: I7c2eb2c283537bbde02db9701e869d9aa46674fc
2021-07-19 05:36:19 +00:00
Paul Duffin
5c21145915 Revert "Export implementation class jars for java_boot_libs"
This reverts commit 22ff0aaf51.

The workaround to support hidden API generation with prebuilts by
passing the full implementation jars through to the SDK snapshot is no
longer needed as the monolithic hidden API flag generation uses the
prebuilt flag files that are already part of the snapshot.

This change reverts that previous workaround.

Bug: 192868581
Test: - Update the prebuilts
      DIST_DIR=$PWD/dist TARGET_BUILD_VARIANT=userdebug art/build/build-art-module.sh --skip-apex
      packages/modules/ArtPrebuilt/update-art-module-prebuilts.py --local-dist=dist --skip-cls --skip-apex
      - Build hidden API flags to make sure it does not fail
Change-Id: Idb3fde6f7dcb171677316d8794a4af91ede1f7e0
2021-07-16 17:04:21 +01:00
Jingwen Chen
f59a8e117e Fix apex bp2build.
apexBundle was missing InitBazelModule for it to have bazel_module properties.

Test: soong unit test
Fixes: 193866723
Change-Id: I5fb38c8b2e8edaecef44162491d399c0223d3fb1
2021-07-16 09:32:49 +00:00
Liz Kammer
aa91cec9cb Merge "Add test to reproduce bug in error message." am: c07b16f49c am: 56008abd97
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1768625

Change-Id: I8eebed1645018ec228c492152862b8046c87122f
2021-07-15 21:45:42 +00:00
Liz Kammer
c07b16f49c Merge "Add test to reproduce bug in error message." 2021-07-15 20:37:52 +00:00
Liz Kammer
0fc1e134b9 Add test to reproduce bug in error message.
soong config variable modules allow specifying a non-existent property,
which results in an unhelpful error message when the module type is then
used.

Bug: 171232169
Test: go test soong tests
Change-Id: I6174c0d35a28952157ee925f51d615e2ee735f8a
2021-07-15 12:38:35 -04:00
Paul Duffin
dff1ccd9b9 Merge "Support fully qualified names in android:"path" properties" am: 9e3e9c905b am: bd01c983d3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1761491

Change-Id: I60bd79a3293f3607c5f3856d0336567f6d1f2e34
2021-07-15 16:32:11 +00:00
Paul Duffin
9e3e9c905b Merge "Support fully qualified names in android:"path" properties" 2021-07-15 16:02:34 +00:00
Treehugger Robot
55ac43fbd5 Merge "Update comment text of SrcIsModuleWithTag()" am: f6ecb09322 am: bb3206b0eb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1767845

Change-Id: If85eca8820df23e25d7710f1d0bbf42dfa2209da
2021-07-15 12:06:55 +00:00
Treehugger Robot
f6ecb09322 Merge "Update comment text of SrcIsModuleWithTag()" 2021-07-15 11:24:19 +00:00
Treehugger Robot
a5d5782e39 Merge "dexpreopt.config should be created even though unbundled image is built" am: 75d719fdd7 am: 1bc89a7af1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1730112

Change-Id: I4e91d1b293e84c69f032e148931357e2a050e10f
2021-07-15 09:28:40 +00:00
Yi-Yo Chiang
ba9ea32f73 Update comment text of SrcIsModuleWithTag()
The actual behavior of the method is slightly different from its text
right now. Update the text to describe the actual behavior.

Bug: 193228441
Test: m nothing (change is noop)
Change-Id: I755829af6aa1b3f95ac71f33d75751b94e71b54b
2021-07-15 17:18:21 +08:00
Treehugger Robot
75d719fdd7 Merge "dexpreopt.config should be created even though unbundled image is built" 2021-07-15 03:41:30 +00:00
Jeongik Cha
4b073cd083 dexpreopt.config should be created even though unbundled image is built
Bug: 188179858
Test: compare dexpreopt_config.zip files from
 1. TARGET_BUILD_UNBUNDLED_IMAGE=true m dexpreopt_config_zip
 2. m dexpreopt_config_zip
(note that m clean should run between steps)

Change-Id: I36a6e8b10b9922cc5522accaf90af1aa05049a86
2021-07-15 09:57:49 +09:00
Paul Duffin
40131a3f9e Support fully qualified names in android:"path" properties
Previously, a module reference in a path property would be parsed into
two parts, the module name and the optional output tag, which defaults
to an empty string if not specified. The output tag would be stored in
a sourceOrOutputDependencyTag which would then be used, along with the
module name to add a dependency on the module.

Later, when the paths were processed the same module reference would be
parsed into the same two parts again and the module name used to find a
matching Module by comparing it against the name returned by either
Module.Name(), ctx.OtherModuleName() or ModuleBase.BaseModuleName().
Once the module had been found then if it supported OutputFilesProducer
then the tag would be passed to its OutputFiles(tag) method. Otherwise,
it would fall back to treating it as SourceFilesProducer.

The problem with that is the module name retrieved from the module in
some way (either directly or through a context name) could be different
to that originally supplied when adding the dependency. e.g.
1. If the original dependency was added onto a source module but there
   existed a suitable and preferred prebuilt module then the dependency
   onto the source module would have been replaced by the prebuilt
   module which has a different name.
2. If the path property included a fully qualified name that included
   a qualifying path then it would not match the name retrieved from
   the module which would not include the qualifying path.

This change circumvents that whole issue by adding the module name that
was originally used to add the dependency into the DependencyTag. Now
the DependencyTag uniquely identifies the original module/outputTag
pair parsed from the module reference. The pathDepsMutator guarantees
that they are unique as it dedups them before adding the dependencies.

It is possible that calling ExtractSource(s)Deps() would add some
duplicate but if they did they would be identical, i.e. the same
sourceOrOutputDependencyTag would be used to add a dependency onto the
exact same module. In that case it would not matter which of the
dependencies was found as it would still return the same module.

Bug: 193228441
Test: m nothing
Change-Id: I661514a2984818e5c26577411cede53eb57bcd02
2021-07-14 23:58:49 +01:00
Paul Duffin
11df6ea178 Merge "Choose prebuilt or source via an Soong config variable" am: e88944c51e am: 435ef09c6a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1762228

Change-Id: I15d4a2f5754eaa5f2446a82b476175f4e003be5f
2021-07-14 20:58:05 +00:00
Paul Duffin
e88944c51e Merge "Choose prebuilt or source via an Soong config variable" 2021-07-14 20:23:34 +00:00
Paul Duffin
0c52c7ba63 Choose prebuilt or source via an Soong config variable
A simple way to provide fine grained control over the use of a prebuilt
or source module via a Soong config variable.

Bug: 193523070
Test: m nothing
Change-Id: I47ae8ac04fa29156d2e87efd9e60ab995f50ea6d
2021-07-14 20:23:06 +00:00