Commit Graph

23700 Commits

Author SHA1 Message Date
Paul Duffin
d295daa19a Ensure that sdk/module_exports depends on source members am: cee7e66b07 am: e371a18acc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1359444

Change-Id: If241aea3d4997adfa1edea5e17c35b02f6bc0eb6
2020-07-09 21:58:57 +00:00
Paul Duffin
e371a18acc Ensure that sdk/module_exports depends on source members am: cee7e66b07
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1359444

Change-Id: Ie52a110e30e646a0fdf9479039bb58ee6a722078
2020-07-09 21:42:34 +00:00
Paul Duffin
cee7e66b07 Ensure that sdk/module_exports depends on source members
Previously, preferring a prebuilt of an sdk/module_exports's member
would cause the sdk/module_exports to depend on the prebuilt instead
of the source and cause problems with the build.

This chance prevents the dependency from an sdk/module_exports to its
members from being replaced with prebuilts.

Bug: 160785918
Test: m nothing
Change-Id: Iee4bcd438c11929e30fb5766701b05a0e89956d9
2020-07-09 17:51:06 +01:00
Treehugger Robot
0f472e62f9 Merge changes Iefcf4fbe,I450d4769,I1ffc7e7b am: 2c79c871d9 am: 3757864b5f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1354643

Change-Id: I35b96bffc99f9066982e6ea99332fb84c8f7a840
2020-07-09 12:56:24 +00:00
Treehugger Robot
3757864b5f Merge changes Iefcf4fbe,I450d4769,I1ffc7e7b am: 2c79c871d9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1354643

Change-Id: I1cfb9db20de17755612c85da5324c05177ed493e
2020-07-09 12:44:43 +00:00
Treehugger Robot
2c79c871d9 Merge changes Iefcf4fbe,I450d4769,I1ffc7e7b
* changes:
  Prepend default to allow overriding in the bp file.
  Do not follow SDK member dependencies for APEX payloads.
  Do not follow prebuiltDependencyTags in APEX payload walks.
2020-07-09 12:32:31 +00:00
Treehugger Robot
5bc3d29d14 Merge "Document critical path in perf.md" am: 4e74082665 am: fb13e2db9b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1358804

Change-Id: I1181198d4118c6875e5d4eed77ff28af35eb7051
2020-07-09 02:34:57 +00:00
Treehugger Robot
fb13e2db9b Merge "Document critical path in perf.md" am: 4e74082665
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1358804

Change-Id: I87a1d20ae3c624253f588d4faca0063b08cbf099
2020-07-09 02:16:54 +00:00
Treehugger Robot
4e74082665 Merge "Document critical path in perf.md" 2020-07-09 02:03:20 +00:00
Chris Gross
bd7ad643b5 [automerger skipped] Use a default exclude filter for JaCoCo in Soong. am: 03f3a9c146 -s ours
am skip reason: Change-Id I5466b0a03957edfbe53971d5d1a7729fdb8337db with SHA-1 2f748692dd is in history

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

Change-Id: Ie54c844505e78f7533154ac49613b871680215d5
2020-07-08 23:39:51 +00:00
Colin Cross
d417bf474f Document critical path in perf.md
Test: none
Change-Id: I7de9b98fea67084ec5b5ce5429f0a8f976341439
2020-07-08 15:51:37 -07:00
Chris Gross
03f3a9c146 Use a default exclude filter for JaCoCo in Soong.
Instrumented builds should exclude certain classes from instrumenation
by default. (e.g. JaCoCo itself) Leverage the existing
DefaultJacocoExclusionFilter to do this.

Note: Two different default filters exist now (one for Make and one for
Soong), as they have different wildcard rules.

Test: EMMA_INSTRUMENT=true EMMA_INSTRUMENT_STATIC=true m -j32
TeleService and inspected the resulting temporary jar that was
instrumented to confirm that anything from org/jacoco was excluded.
Bug: 159748844

Change-Id: I5466b0a03957edfbe53971d5d1a7729fdb8337db
Merged-In: I5466b0a03957edfbe53971d5d1a7729fdb8337db
2020-07-08 19:29:10 +00:00
Paul Duffin
7bd62bef11 Restrict replacements of source dependencies with prebuilts am: 80342d72d0 am: 403b15074f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1351596

Change-Id: I738152767fe955ec448471c60f246d58a96d4d7a
2020-07-08 18:33:57 +00:00
Paul Duffin
3b984b7d23 Stop java_sdk_library_import from depending on source modules am: 44f1d8404b am: ad18b5c676
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1351595

Change-Id: I98193c398be14e639aae36983ce3cb30c81a7b6e
2020-07-08 18:33:54 +00:00
Paul Duffin
403b15074f Restrict replacements of source dependencies with prebuilts am: 80342d72d0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1351596

Change-Id: I575c38d7e707bf57afaa54d9d138ffaedbe6abbb
2020-07-08 18:22:32 +00:00
Paul Duffin
ad18b5c676 Stop java_sdk_library_import from depending on source modules am: 44f1d8404b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1351595

Change-Id: I7005815459924ddae58968e631a5809795382c9f
2020-07-08 18:22:28 +00:00
Paul Duffin
80342d72d0 Restrict replacements of source dependencies with prebuilts
Previously, when java_sdk_library_import was preferred over a
java_sdk_library the latter ends up depending on the prebuilt child
modules created by the java_sdk_library_import instead of the source
child modules that it created itself. That was because all dependencies
on those source child modules were replaced with the corresponding
prebuilt child modules.

This change prevents those dependencies from being replaced to preserve
the dependencies from java_sdk_library onto its source child modules by
making the replacement conditional depending on the tag used. It also
updates the affected test.

Bug: 159902351
Test: m nothing
Change-Id: I4441b901dedfd44b9769df1ac2e248b94834cf85
2020-07-08 16:46:16 +01:00
Paul Duffin
44f1d8404b Stop java_sdk_library_import from depending on source modules
Previously, java_sdk_library_import added the dependencies on its child
components in the deps mutator after prebuilts without a matching
source module are renamed to the source module name. That meant that
the java_sdk_library_import has to use the source module name and ended
up depending on the source module unless it was preferred.

This change adds a new component deps mutator that runs before the
PrebuiltRenameMutator so that the java_sdk_library_import can add
dependencies onto the prebuilt modules. It also updates an affected
test.

Bug: 159902351
Test: m nothing
Change-Id: I3576c4873302743e51aff547ea1497bef6d748ac
2020-07-08 16:46:16 +01:00
Jooyung Han
bf5b939437 Merge "Apply "excludes" for OutputFileProducer" am: ecc495fd09 am: af6aa6ae9f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1354451

Change-Id: I3112f29f1e8aa101dbd77ac1d9fd73f50342b742
2020-07-08 07:11:35 +00:00
Jooyung Han
af6aa6ae9f Merge "Apply "excludes" for OutputFileProducer" am: ecc495fd09
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1354451

Change-Id: I486e84a330f00c917293e9586259e49749fd95f0
2020-07-08 06:53:11 +00:00
Jooyung Han
ecc495fd09 Merge "Apply "excludes" for OutputFileProducer" 2020-07-08 06:40:08 +00:00
Treehugger Robot
3f1520570e Merge "Support kotlin multiplatform sources" am: 0ae555df1a am: 202dbc4ec0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1351108

Change-Id: Icbd63ed880b0df404170466c55b295aa4deb821c
2020-07-08 00:42:53 +00:00
Treehugger Robot
202dbc4ec0 Merge "Support kotlin multiplatform sources" am: 0ae555df1a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1351108

Change-Id: I19d0150a037e2b98e0c2498825a6bc6a104ff5a0
2020-07-08 00:27:40 +00:00
Liz Kammer
30d983764d [automerger skipped] Add soong cc and java deps to general-tests dist am: 63d687989d -s ours
am skip reason: Change-Id I683fe1d7e17f7abaab40206770d09db705493ffb with SHA-1 5e07d0ccbb is in history

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

Change-Id: Ibe21079bd3db42e9318ccd2d171535eaddfdd7be
2020-07-08 00:23:11 +00:00
Treehugger Robot
0ae555df1a Merge "Support kotlin multiplatform sources" 2020-07-08 00:13:01 +00:00
Treehugger Robot
09b75f763d Merge "Correct typo of defaults for docs property sorting" am: 85e326d93e am: 86061d3558
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1356145

Change-Id: I4fd4b94c79eb05bfcebf4b294ddd3c748432da3d
2020-07-07 23:24:30 +00:00
Treehugger Robot
86061d3558 Merge "Correct typo of defaults for docs property sorting" am: 85e326d93e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1356145

Change-Id: I15ea4e33d1355a6e5d303fba172a88320909df2f
2020-07-07 23:15:24 +00:00
Treehugger Robot
85e326d93e Merge "Correct typo of defaults for docs property sorting" 2020-07-07 22:58:32 +00:00
Liz Kammer
63d687989d Add soong cc and java deps to general-tests dist
Test: m SOONG_COLLECT_CC_DEPS=true SOONG_COLLECT_JAVA_DEPS=true dist
  general-tests and verify module_bp_java_deps.json and
  module_bp_cc_deps.json is in out/dist
Test: m SOONG_COLLECT_CC_DEPS=true SOONG_COLLECT_JAVA_DEPS=true
  checkbuild dist general-tests
Bug: 154845369

Merged-In: I683fe1d7e17f7abaab40206770d09db705493ffb
Change-Id: I683fe1d7e17f7abaab40206770d09db705493ffb
2020-07-07 22:41:31 +00:00
Christopher Parsons
8bb12e9548 Merge "Add data_libs property to cc_test rules" am: c87fbdd0bd am: 2066b2d5dd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324844

Change-Id: Ie4b139b490ec58a6a7a55515035e8dccd6c81f1a
2020-07-07 22:02:22 +00:00
Christopher Parsons
2066b2d5dd Merge "Add data_libs property to cc_test rules" am: c87fbdd0bd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324844

Change-Id: I2d2a794ea4f7dbff9cb95c9f92c40db5013ec940
2020-07-07 21:48:14 +00:00
Christopher Parsons
c87fbdd0bd Merge "Add data_libs property to cc_test rules" 2020-07-07 21:26:56 +00:00
Liz Kammer
a93fbacdbe Correct typo of defaults for docs property sorting
Test: manual
Change-Id: Iaca7ba51ca658529dacd2a324412964b2732c4b4
2020-07-07 13:47:29 -07:00
George Burgess IV
feb6b1e26a Merge "soong: globally enable -Wunreachable-code-loop-increment" am: c5f2aa4e73 am: 06285bd9a3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1242459

Change-Id: I90b6c54b13730b27aa0391c823888ebea5cfb9a8
2020-07-07 20:31:44 +00:00
George Burgess IV
06285bd9a3 Merge "soong: globally enable -Wunreachable-code-loop-increment" am: c5f2aa4e73
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1242459

Change-Id: Icbd70eb0c3588e3459c117a8010247a444e8ebad
2020-07-07 20:05:59 +00:00
George Burgess IV
c5f2aa4e73 Merge "soong: globally enable -Wunreachable-code-loop-increment" 2020-07-07 19:49:53 +00:00
Chris Parsons
79d66a5db7 Add data_libs property to cc_test rules
This allows dependencies on link:shared variant of library modules, and
adds the shared libraries adjacent to the test binary

Test: Manually verified on bionic-unit-tests target
Change-Id: I5d406bf9428664c5ac3d3c5915507b750375debb
2020-07-07 15:13:36 -04:00
Martin Stjernholm
26ab8e80e4 Prepend default to allow overriding in the bp file.
Bug: 143948100
Bug: 151303681
Test: m nothing
Change-Id: Iefcf4fbe9d2971ce267242185165f0c38f68db30
2020-07-07 18:14:26 +01:00
Martin Stjernholm
cc77601d10 Do not follow SDK member dependencies for APEX payloads.
Test: m nothing
Test: `m` with prebuilts/runtime in the manifest (along with other
  fixes)
Bug: 151303681
Change-Id: I450d476975c7ab4434228b8c4baf3af192142211
2020-07-07 18:14:26 +01:00
Martin Stjernholm
58c33f073d Do not follow prebuiltDependencyTags in APEX payload walks.
If prebuilts are active they will have the other direct dependencies
from the source modules.

Bug: 151303681
Test: m nothing
Test: `m` with prebuilts/runtime in the manifest (along with other
  fixes)
Change-Id: I1ffc7e7b528ed9db5ce6ca2ee96c9d23c6548c49
2020-07-07 18:12:41 +01:00
Liz Kammer
66aab00478 Merge "Add soong cc and java deps to general-tests dist" am: 203a3f2f39 am: 49ab00709d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1353585

Change-Id: I4aa866011c467979fdefa6a30fa660f125a4d414
2020-07-07 15:30:48 +00:00
Liz Kammer
49ab00709d Merge "Add soong cc and java deps to general-tests dist" am: 203a3f2f39
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1353585

Change-Id: I5b7663bd707b793e69c5a44630f2f2021a452d4c
2020-07-07 15:12:57 +00:00
Liz Kammer
203a3f2f39 Merge "Add soong cc and java deps to general-tests dist" 2020-07-07 15:01:17 +00:00
Colin Cross
978c29cb39 Dist module_paths/files.db am: 96e5e41b88 am: 92c2936f67
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1356181

Change-Id: I4ebb6dcda32a1cbb38e9c48af841b5cfb7a46387
2020-07-07 04:03:11 +00:00
Colin Cross
92c2936f67 Dist module_paths/files.db am: 96e5e41b88
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1356181

Change-Id: I30c5d4a24ba1d73fe4c68d796643461da07da500
2020-07-07 03:40:46 +00:00
Colin Cross
a4c8cc6471 Support kotlin multiplatform sources
Add a common_srcs property and propagate it to the module.xml file
passed to kotlinc.

Test: m checkbuild
Change-Id: Ief768bafb943513c9ffbc01e829abc078f0a72bc
2020-07-06 17:58:09 -07:00
Colin Cross
96e5e41b88 Dist module_paths/files.db
Help debugging finder issues by disting module_paths/files.db for
later analysis.

Bug: 157656545
Test: treehugger
Change-Id: Idfa4cffe7ef724b399a2667efd487f9c3c76bb6b
2020-07-06 17:15:05 -07:00
Liz Kammer
5e07d0ccbb Add soong cc and java deps to general-tests dist
Test: m SOONG_COLLECT_CC_DEPS=true SOONG_COLLECT_JAVA_DEPS=true dist
  general-tests and verify module_bp_java_deps.json and
  module_bp_cc_deps.json is in out/dist
Test: m SOONG_COLLECT_CC_DEPS=true SOONG_COLLECT_JAVA_DEPS=true
  checkbuild dist general-tests
Bug: 154845369

Change-Id: I683fe1d7e17f7abaab40206770d09db705493ffb
2020-07-06 16:19:56 -07:00
Christopher Parsons
653919780e Merge "Add missing soong_docs inputs" am: 0eeff82c98 am: 4dada6c581
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1347867

Change-Id: I2190bf0119fa20802a586ca651f4a20a8a34e414
2020-07-06 23:16:20 +00:00
Christopher Parsons
4dada6c581 Merge "Add missing soong_docs inputs" am: 0eeff82c98
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1347867

Change-Id: I0fc0f24a029e4eb25f3d2ffd2c18194fb47c40f4
2020-07-06 22:58:35 +00:00