Commit Graph

23675 Commits

Author SHA1 Message Date
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
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
Christopher Parsons
0eeff82c98 Merge "Add missing soong_docs inputs" 2020-07-06 22:34:51 +00:00
Jooyung Han
efa4ecd851 Merge "cc: add exclude_generated_sources property" am: 5aa31347bc am: d7f8cd0baf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1354450

Change-Id: I5213f0c050fb6daf552d6adb376d3fa3a6bc59b3
2020-07-06 21:59:05 +00:00
Ramy Medhat
c0a2a6c182 [automerger skipped] Merge "Add sandbox property to the javadoc rule." into rvc-dev am: 1b7fc95d68 -s ours
am skip reason: Change-Id I7256d29f18e0af18dbe65d1c7dbbf62fd3d65f4c with SHA-1 2f99eec459 is in history

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

Change-Id: I408bf34a2b15342f48b05dfa69d8ebabf41a8877
2020-07-06 21:47:05 +00:00
Jooyung Han
d7f8cd0baf Merge "cc: add exclude_generated_sources property" am: 5aa31347bc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1354450

Change-Id: Ib767a1a2b2481729eb3d0ed48368075723c02d07
2020-07-06 21:46:58 +00:00
Oliver Nguyen
0a893233e2 [automerger skipped] Merge changes from topic "gcov-clang-migration" into rvc-dev am: f6cd2a0cc6 -s ours
am skip reason: Change-Id I215124a9b35a2ad50ad562079d392e3d33da11f4 with SHA-1 1a6acd4f39 is in history

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

Change-Id: Icfe415272231e38d02bf36943a61f8a5776791e6
2020-07-06 21:46:55 +00:00
Ramy Medhat
1b7fc95d68 Merge "Add sandbox property to the javadoc rule." into rvc-dev 2020-07-06 21:34:58 +00:00
Jooyung Han
5aa31347bc Merge "cc: add exclude_generated_sources property" 2020-07-06 21:32:25 +00:00
Oliver Nguyen
f6cd2a0cc6 Merge changes from topic "gcov-clang-migration" into rvc-dev
* changes:
  Make native_coverage clause work with ClangCoverage
  Introduce product variables to select Java code coverage paths in Soong.
  Rename native code coverage paths product variables in Soong.
2020-07-06 21:07:54 +00:00
Ramy Medhat
abe1a1aa3e Add sandbox property to the javadoc rule.
The sandbox property indicates whether metalava should only read
inputs explicitly specified on the command line. This CL adds the
property and sets the appropriate configuration for RBE depending
on whether the sandbox is set or not.
Bug: b/156613606
Test: built aosp_crosshatch-userdebug with/without RBE_METALAVA.
Change-Id: I7256d29f18e0af18dbe65d1c7dbbf62fd3d65f4c
Merged-In: I7256d29f18e0af18dbe65d1c7dbbf62fd3d65f4c
2020-07-06 20:00:13 +00:00
Treehugger Robot
e0e1a8637c Merge "Tidy up the definition of sdkCore." am: 759ccc13af am: 6f69e3a2db
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1353933

Change-Id: Ie103f2b10b2f7dfb3dcb6f5cb9c81d41833f43a3
2020-07-06 13:04:38 +00:00
Treehugger Robot
6f69e3a2db Merge "Tidy up the definition of sdkCore." am: 759ccc13af
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1353933

Change-Id: Ib7493194d3a67968cb7db55642fe00fda9e72e52
2020-07-06 12:57:15 +00:00
Treehugger Robot
759ccc13af Merge "Tidy up the definition of sdkCore." 2020-07-06 12:48:44 +00:00
Jooyung Han
6114532193 remove unused GeneratedHeaders variable am: 8f9782f513 am: 3e3626bbc1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1354449

Change-Id: Iaf9f33430fa67d676a19555d37d00124459dc247
2020-07-05 00:33:11 +00:00
Jooyung Han
3e3626bbc1 remove unused GeneratedHeaders variable am: 8f9782f513
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1354449

Change-Id: I510e41d20e343ef29dd4859b870904e2d6afa268
2020-07-05 00:19:40 +00:00
Jooyung Han
ac07f880d8 cc: add exclude_generated_sources property
generated_sources needs exclude_* just like that srcs needs exclude_srcs
to support variant-specific exclusion of source files.

Bug: 159585065
Test: m
Change-Id: I49e49b0b3a0115a01fc9cf6f9fe74b23e723a785
2020-07-05 04:04:09 +09:00
Jooyung Han
8f9782f513 remove unused GeneratedHeaders variable
Even though modules listed in generated_headers may produce .h files and
return the list of them as GeneratedSourceFiles(), cc modules do not
need them. GeneratedDeps() and GeneratedHeaderDirs() are what we need.

Bug: n/a
Test: m
Change-Id: I655f88e8c1a387e256c58913931721aaeab90b62
2020-07-05 01:33:24 +09:00
Colin Cross
72cabc6255 Make native_coverage clause work with ClangCoverage
Make uses NATIVE_COVERAGE to enable gcov coverage and CLANG_COVERAGE
to enable clang coverage.  NATIVE_COVERAGE is translated to the Soong
Native_coverage product variable which triggers the native_coverage
clause in Android.bp files.  The clause also needs to be triggered
for CLANG_COVERAGE.

Rename the existing Native_coverage product variable to GcovCoverage,
and regenerate Native_coverage when either GcovCoverage or
ClangCoverage are set.

Also remove NativeLineCoverage, it wasn't doing anything differently
than Native_coverage.

Bug: 159059537
Test: m checkbuild
Merged-In: I215124a9b35a2ad50ad562079d392e3d33da11f4
Change-Id: I215124a9b35a2ad50ad562079d392e3d33da11f4
2020-07-02 11:21:36 -07:00
Ulyana Trafimovich
21b5ffa966 Merge changes from topic "uses-libs-5" am: 8fab5bcce3 am: a4cdcd3796
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1353554

Change-Id: I182197011a993ebc47312131327faefe9d4b17c3
2020-07-02 09:32:32 +00:00
Ulyana Trafimovich
a4cdcd3796 Merge changes from topic "uses-libs-5" am: 8fab5bcce3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1353554

Change-Id: I11201716a66279597781fbe9595e01fee32a84a5
2020-07-02 09:20:25 +00:00
Ulyana Trafimovich
8fab5bcce3 Merge changes from topic "uses-libs-5"
* changes:
  Rewrite construct_context.sh in Python.
  Refactor class loader context generation.
2020-07-02 09:06:27 +00:00
Inseob Kim
9462819908 [automerger skipped] Merge "Include shared lib in vendor snapshot if isVndkExt" am: a04db44964 am: bde72ec732 -s ours
am skip reason: Change-Id I3eb4794c1be2949b9c85fd52f823e5e14df4ad7d with SHA-1 f99b355c0a is in history

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

Change-Id: I4013e129420410cd3c3911157532bb56f8bb752d
2020-07-02 08:06:52 +00:00
Inseob Kim
bde72ec732 Merge "Include shared lib in vendor snapshot if isVndkExt" am: a04db44964
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1354063

Change-Id: I9ee11a10dcaf842a829506aedf774602c01b46f5
2020-07-02 07:55:53 +00:00
Inseob Kim
a04db44964 Merge "Include shared lib in vendor snapshot if isVndkExt" 2020-07-02 07:42:16 +00:00
Bill Peckham
7d3f096cf4 Include shared lib in vendor snapshot if isVndkExt
A VDNK extension is an image:vendor module provided by a
vendor-modified framework project. So it should be
provided to the vendor build as a prebuilt (for the
purposes of building against a vendor snapshot).

Exempt-From-Owner-Approval: cherry pick from internal branch

Bug: 160189878
Test: manual
Change-Id: I3eb4794c1be2949b9c85fd52f823e5e14df4ad7d
Merged-In: I3eb4794c1be2949b9c85fd52f823e5e14df4ad7d
2020-07-02 07:42:05 +00:00