Commit Graph

20683 Commits

Author SHA1 Message Date
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
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
Treehugger Robot
0ae555df1a Merge "Support kotlin multiplatform sources" 2020-07-08 00:13:01 +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
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
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
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
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
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
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
Jooyung Han
5aa31347bc Merge "cc: add exclude_generated_sources property" 2020-07-06 21:32:25 +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
7607dd3564 Apply "excludes" for OutputFileProducer
"excludes" should be applied both SourceFileProducer and
OutputFileProducer. But we've been missing the latter.
(see android/paths_test.go)

There's one more to note. Previously, the exclusion was done by
modifying slice directly, which caused some problem(b/76179848).
The fix was returning a copy from Srcs() method. But there're still many
implementors which just return internal slices directly.

This change creates a new array when it needs to exclude something from
returned slice.

Bug: n/a
Test: m (soong test added)
Change-Id: I1ba91e490cb55fc243020681667278cdc75f59df
2020-07-05 10:23:14 +09: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
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
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
Treehugger Robot
062e9afe7e Merge "apex: add / in file_contexts as system_file" am: fae9e0cf9a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1351465

Change-Id: I1dab11f8feb4c61e02ddb0299fd54756de3ae10e
2020-07-02 04:31:07 +00:00
Treehugger Robot
fae9e0cf9a Merge "apex: add / in file_contexts as system_file" 2020-07-02 04:22:46 +00:00
Treehugger Robot
f9d5977467 Merge "Dedup NDK library lists in make." am: 8cf2fda4c4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1353449

Change-Id: I71fb9df477b858276706af826e07ed3e7b27585b
2020-07-02 02:29:20 +00:00
Treehugger Robot
8cf2fda4c4 Merge "Dedup NDK library lists in make." 2020-07-02 02:12:26 +00:00
Treehugger Robot
5ba520122b Merge "Fix out/soong/Android-<>.mk reproducibility" am: 2e93eb702d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1353442

Change-Id: I529e89400a980a585ba295c5e4a5fa985a1120be
2020-07-02 01:13:38 +00:00
Treehugger Robot
2e93eb702d Merge "Fix out/soong/Android-<>.mk reproducibility" 2020-07-02 00:57:17 +00:00
Treehugger Robot
df1d1240f6 Merge "Rename module -> module-lib" am: 756aa63aee
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1340036

Change-Id: Ifc6c1b399002605de4cda1dbef22c858fc9ecb17
2020-07-02 00:13:35 +00:00
Treehugger Robot
756aa63aee Merge "Rename module -> module-lib" 2020-07-01 23:58:07 +00:00
Matthew Maurer
cd39a5f2a2 Merge changes from topic "rust-flex" am: 367c01b19b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1353062

Change-Id: Ia79b3e0dc51ae55431e55b22b1329421e2678c9e
2020-07-01 22:41:35 +00:00
Matthew Maurer
8ce15394c1 rust: Mutate prebuilt modules dylib/rlib am: c761eeca48
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1349327

Change-Id: I70dbfeecfbb5d31df53790e12382495e2a9d5d2f
2020-07-01 22:41:33 +00:00
Matthew Maurer
4b8457b422 rust: Add rustlibs auto dependency selection am: 0f003b1851
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1347866

Change-Id: I3bdcbb3770cd0fa28fdd8840cbb879dc1658423d
2020-07-01 22:41:32 +00:00
Matthew Maurer
f7aa77edfb rust: Change default variants am: 2ae0513a8e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1347868

Change-Id: I63b7cdd97d36d524a25d3a7b64fe97bd377ed0f1
2020-07-01 22:41:28 +00:00
Matthew Maurer
60d41b05d4 rust: Fix Properties inheritance for prebuilts am: 128f53b3b4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1353063

Change-Id: Iab5949e9b76700fa9d565d160cd9d8a9cb8ee47c
2020-07-01 22:41:24 +00:00
Matthew Maurer
367c01b19b Merge changes from topic "rust-flex"
* changes:
  rust: Suppress default sysroot unconditionally
  rust: Mutate prebuilt modules dylib/rlib
  rust: Add rustlibs auto dependency selection
  rust: Change default variants
  rust: Fix Properties inheritance for prebuilts
2020-07-01 22:26:44 +00:00
Dan Willemsen
1a8c8565bd Fix out/soong/Android-<>.mk reproducibility
When there were multiple modules overriding a single module, sometimes
we would create the list in different orders, which would trigger some
of the later mutators to write the Android-<>.mk out in different
orders.

Bug: 160207422
Test: diff out/soong/Android-<>.mk between multiple runs on internal master
Change-Id: I321db706dd34aa20a0b1556fd282d54b826a4a97
2020-07-01 15:13:58 -07:00
Treehugger Robot
5f33df625a Merge "Generate the known NDK libraries list." am: 2e1b8baeda
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1353447

Change-Id: I05725fdfbbd34ee839ac63ff5534a7c40643a122
2020-07-01 21:57:23 +00:00
Treehugger Robot
2e1b8baeda Merge "Generate the known NDK libraries list." 2020-07-01 21:43:09 +00:00