StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
49,673 Commits 1 Branch 0 Tags
0ed5f23ff74005b29bdd034b31f966cf9da7fc13
Commit Graph

4115 Commits

Author SHA1 Message Date
Sam Delmerico
49c21bb02a Merge "product variables are consumed via soong injection" am: 2882dcb74b am: 8e27992e34 am: 2e7b1d633c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1956480

Change-Id: Ia3e0a3486cc08809ada7ea3636dd0cfb3905e0c6
 2022-01-27 15:23:45 +00:00
Sam Delmerico
2882dcb74b Merge "product variables are consumed via soong injection" 2022-01-27 14:31:08 +00:00
Liz Kammer
b237576331 Merge "Reverse order of tag and android module checks" am: 91ee673ccd am: 442ed3f1d5 am: d017eb755a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1959619

Change-Id: Idb533a884d4458841cb15a2da8c356a07e9ca79a
 2022-01-26 19:36:19 +00:00
Sam Delmerico
5c32bbf910 product variables are consumed via soong injection 
Currently the list of product variables and whether they are arch-variant is
hard-coded. Instead, we can generate this data from the Soong Product_variables
struct and use soong_injection to consume it in Bazel.

Bug: 209801976
Test: m bp2build && build/bazel/ci/mixed_libc.sh
Change-Id: I8a91030950407a10832765f15eb010899d73da26
 2022-01-26 19:26:09 +00:00
Liz Kammer
91ee673ccd Merge "Reverse order of tag and android module checks" 2022-01-26 18:53:40 +00:00
Sorin Basca
a27fd80f3f Merge "Revert^2: "Setting Java 11 as the default version"" am: eb76d218e9 am: 9aef4c5930 am: f982c27555 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1957404

Change-Id: I874d9793b6af6e17f225ce04c6947b606ac71290
 2022-01-25 06:41:48 +00:00
Liz Kammer
5514698bc8 Reverse order of tag and android module checks 
Currently, this checks validates a module then checks the tag for all
modules. However, we don't need to validate modules where the tag does
not apply.

Test: m nothing and compare ninja/mk files
Change-Id: I6298c9dc8aa37ffac74202bea59f4090fff90e4e
 2022-01-24 16:17:30 -05:00
Sorin Basca
18ecf61090 Revert^2: "Setting Java 11 as the default version" 
Reverted Change: I2f9866deff41406aede24758f6eda5e5808c7f29

Reason for revert: Post-submission failure have been fixed.

Test: presubmit
Bug: 195387473
Change-Id: If5db1614ef455e2f1eae1d36cf514e13e7aab993
 2022-01-24 13:31:05 +00:00
Romain Jobredeaux
0b93c3e3f1 Merge "Revert "Revert "Add static_libs support to android_app bp2build converter.""" am: f49ca9e40d am: 2303c67479 am: b2e3ee4575 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1948956

Change-Id: I8f8d772d7043c5e8bf1b20fba8e2966905595a98
 2022-01-21 21:55:50 +00:00
Sam Delmerico
37e836de84 Merge "bp2build converts java_genrule and java_genrule_host" am: 925a30496a am: 61294da112 am: 3964495e4c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1946827

Change-Id: Ibfdbbfa9100a74f8bd7a0907837f829fd58ed703
 2022-01-21 20:51:50 +00:00
Romain Jobredeaux
f49ca9e40d Merge "Revert "Revert "Add static_libs support to android_app bp2build converter.""" 2022-01-21 20:51:06 +00:00
Sam Delmerico
cd1b80f067 bp2build converts java_genrule and java_genrule_host 
Bp2build currently supports building genrules for cc modules, but does
not support building java_genrule* modules. This commit adds this
functionality.

Bug: 213480907
Test: go test ./bp2build
Change-Id: I473196c5bcf5582ba0c8faa65b5005f81ac973a4
 2022-01-21 17:50:40 +00:00
Sorin Basca
902ad4c260 Merge "Revert "Setting Java 11 as the default version"" am: e7421c15dd am: a0abe6e74e am: cee0e6bf57 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1956197

Change-Id: I8a7c49f1a5cd48b868813cd54dafa42c1ab8c8fd
 2022-01-20 16:39:24 +00:00
Sorin Basca
e7421c15dd Merge "Revert "Setting Java 11 as the default version"" 2022-01-20 15:38:50 +00:00
Sorin Basca
8d3e0bb25e Revert "Setting Java 11 as the default version" 
Revert submission 1944928-default-java11

Reason for revert: Post-submit failures
Reverted Changes:
Ia9a0aa2a4:Setting Java 11 as the default version
Ibf5d10521:Setting Java 11 as the default version

Fixes: 215504708
Fixes: 215502091
Fixes: 215502091
Change-Id: I2f9866deff41406aede24758f6eda5e5808c7f29
 2022-01-20 15:37:11 +00:00
Sorin Basca
9ac9f195d2 Merge "Setting Java 11 as the default version" am: 2c32bbfd73 am: cc0930b609 am: fe7d51f352 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1946707

Change-Id: Ie1f4348448c32b79d53c1e7c1081003e5e5b2049
 2022-01-20 11:10:30 +00:00
Sorin Basca
2c32bbfd73 Merge "Setting Java 11 as the default version" 2022-01-20 09:00:32 +00:00
Romain Jobredeaux
355851b520 Revert "Revert "Add static_libs support to android_app bp2build converter."" 
This reverts commit b33e0b8b5b.

Reason for revert: CI failure deemed to be a fluke

Change-Id: Ia804d531092921e4ad090740420c4a4e02e6ff00
 2022-01-19 21:13:51 +00:00
Jingwen Chen
3ded2c64ee Merge "Support multilib in apex." am: 539d41b686 am: 2cda5749f4 am: e1fc6a20ca 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1932025

Change-Id: I9c6d927709f20eb77cf083f81f2616d27e784697
 2022-01-19 12:00:41 +00:00
Jingwen Chen
539d41b686 Merge "Support multilib in apex." 2022-01-19 11:11:05 +00:00
Yu Liu
4ae55d17f6 Support multilib in apex. 
Bug: b/208325023
Test: Added unit tests, also tested with adbd apex build manually.
Change-Id: I47e04cd4eb5d05227f0a84683dcb66dff00e3514
 2022-01-18 10:38:05 -08:00
Treehugger Robot
f5b0c2299f Merge "Implement stubs.symbol_file and stubs.versions for cc_library_shared bp2build." am: 9e46741e73 am: d3066c7de1 am: 8c48fac4eb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1940900

Change-Id: I7a60b1b0207d7af3bf5c2372b72d09963aa609cc
 2022-01-18 11:37:45 +00:00
Sorin Basca
171c2103b8 Setting Java 11 as the default version 
Test: m
Change-Id: Ia9a0aa2a4aa02d7b67ad8e1cb6083d33c3d75e70
 2022-01-18 09:05:34 +00:00
Jingwen Chen
0ee88a6b65 Implement stubs.symbol_file and stubs.versions for cc_library_shared bp2build. 
This CL turns the stubs.symbol_file and stubs.versions properties into
stubs_symbol_file and stubs_version attributes on the cc_shared_library
target. See associated build/bazel change on how these attributes are
used to generate stub libraries.

Bug: 207812332

Test: New tests
Test: CI
Change-Id: Ie23eafb9903a131d92ff4e251215e998cea0a763
 2022-01-17 13:03:12 +00:00
Treehugger Robot
276f51d23f Merge "Start unblocking com.android.runtime deps" am: 8f5399889b am: f3564950a1 am: 713266a4e6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1925162

Change-Id: I3ef37d713a3d5f2988f7b717d6511c7201b5c4d1
 2022-01-13 20:48:58 +00:00
Treehugger Robot
8f5399889b Merge "Start unblocking com.android.runtime deps" 2022-01-13 19:57:01 +00:00
Romain Jobredeaux
c19a2c16bd Merge "Revert "Add static_libs support to android_app bp2build converter."" am: 8a9a97b4a0 am: 474eddd20b am: 9b36f4b981 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1948756

Change-Id: Ic81994d5f78334f08bef258f017ff2a2e9b5a353
 2022-01-13 17:44:21 +00:00
Romain Jobredeaux
8a9a97b4a0 Merge "Revert "Add static_libs support to android_app bp2build converter."" 2022-01-13 17:03:26 +00:00
Romain Jobredeaux
9dbe366934 Merge "Add static_libs support to android_app bp2build converter." am: 24431448b2 am: 6eae04a33f am: 519e09f11d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1917405

Change-Id: Ib9c373d70eb13087ea0e68230b7f882080e5ceb6
 2022-01-13 15:43:27 +00:00
Romain Jobredeaux
b33e0b8b5b Revert "Add static_libs support to android_app bp2build converter." 
This reverts commit de722acd96.

Reason for revert: broke bp2build CI

Change-Id: I535e8746e846c20f1a47c2a1eb0362276af49206
 2022-01-13 15:16:12 +00:00
Romain Jobredeaux
24431448b2 Merge "Add static_libs support to android_app bp2build converter." 2022-01-13 15:00:44 +00:00
Martin Stjernholm
e6ccbe1336 Merge "Fix genrule tool dependencies when a prebuilt tool is preferred." am: 3a1a4b070e am: 6656d4671a am: e163811966 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1946708

Change-Id: I467115735957d366735cd684c52ccd7d27c489cf
 2022-01-13 08:24:36 +00:00
Martin Stjernholm
3a1a4b070e Merge "Fix genrule tool dependencies when a prebuilt tool is preferred." 2022-01-13 07:43:15 +00:00
Martin Stjernholm
dbd814d44e Fix genrule tool dependencies when a prebuilt tool is preferred. 
Since the genrule tool dep mutator runs after the prebuilt mutators,
this adds a helper function android.PrebuiltGetPreferred to resolve the
source or prebuilt as appropriate.

Test: m SOONG_CONFIG_art_module_source_build=false droid
  in internal
Bug: 214292395
Change-Id: I1a208fd048b998f9f19ad1f45d8389decda2cb9e
 2022-01-12 23:35:57 +00:00
Sam Delmerico
099abc955e Merge "Support enabled flag in product variable config" am: 443703ab32 am: 0b75591af3 am: f76b955589 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1944064

Change-Id: I52161d9e48f3456f967816b471adeff34d0e8ec7
 2022-01-12 21:18:00 +00:00
Sam Delmerico
443703ab32 Merge "Support enabled flag in product variable config" 2022-01-12 20:34:14 +00:00
Sam Delmerico
0e33c9d772 Support enabled flag in product variable config 
Some Android.bp modules have `enabled: false` but only use a product
variable such as `source_build` to enable the module.  Currently b2build
does not handle this case at all. This commit adds the functionality
to support this use case.

Also, remove `__enabled` suffix in ProductVariable SelectKey.

Bug: 210546943
Test: go test ./bp2build
Topic: use_enabled_flag_product_variable_config
Change-Id: I459c17a84c172df010666391066bf4d11d19253e
 2022-01-12 16:26:44 +00:00
Liz Kammer
4d7be9bab5 Merge "Add SetProperties to json-module-graph" am: adf1b2a2cd am: b6fdee8f0a am: bbd97028b8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1937639

Change-Id: Ida7e56de037ef33121705423ae3c77251b1b4e98
 2022-01-12 14:05:45 +00:00
Liz Kammer
4e491af625 Merge "Revert "Revert "bp2build: convert host & prebuilt header libraries""" am: e844132b85 am: 86151370ef am: d490d54259 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1944329

Change-Id: I7eb514bc4e0e98d0a8f77ee708d5356b86b921a3
 2022-01-12 14:05:28 +00:00
Liz Kammer
adf1b2a2cd Merge "Add SetProperties to json-module-graph" 2022-01-12 13:23:33 +00:00
Liz Kammer
e844132b85 Merge "Revert "Revert "bp2build: convert host & prebuilt header libraries""" 2022-01-12 13:23:16 +00:00
Liz Kammer
3d3b35c94e Revert "Revert "bp2build: convert host & prebuilt header libraries"" 
This reverts commit 105deedfc7.

Reason for revert: Revert with forward fix

Change-Id: Ib0b6f6b1cbb011b4c5f2133e1cc15ec76ff29253
 2022-01-11 16:02:50 +00:00
Jingwen Chen
a7cf23531e Merge "Revert "bp2build: convert host & prebuilt header libraries"" am: ed4900f9d9 am: 4c909dcd5e am: 446f85be40 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1944703

Change-Id: I9e21377fba0a9f34c88e4555c264dc8542e57fad
 2022-01-11 15:51:40 +00:00
Liz Kammer
9525e71003 Add SetProperties to json-module-graph 
SetProperties contains name and type of properties set in the bp file
and any set via defaults. There may be properties that were not
specified in an Android.bp file due to:
* specified via go code (e.g. LoadHooks)
* property is _not_ a pointer -- so it is not possible to tell between
  not set in bp file and default value.

Test: soong tests
Test: m json-module-graph and verify
Change-Id: I4cb868b1d7db566e72636c6fb53bb9c7090f236a
 2022-01-11 10:47:23 -05:00
Jingwen Chen
ed4900f9d9 Merge "Revert "bp2build: convert host & prebuilt header libraries"" 2022-01-11 14:58:56 +00:00
Jingwen Chen
105deedfc7 Revert "bp2build: convert host & prebuilt header libraries" 
This reverts commit d8a72d7dc9.

Reason for revert: root cause for b/214013899

Change-Id: If769708408c419c2fd3d9484fbf40202b7276299
 2022-01-11 12:51:27 +00:00
Inseob Kim
51c8d94d37 Merge "Revert^3 "Add seapp_contexts to allowlist of makefile goal"" am: 865d5e6c9d am: c24e740cd0 am: 865498319d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1934941

Change-Id: I6eb14ca05494ff8c972068615dfc35dc4e3a303f
 2022-01-10 12:12:37 +00:00
Inseob Kim
865d5e6c9d Merge "Revert^3 "Add seapp_contexts to allowlist of makefile goal"" 2022-01-10 11:15:28 +00:00
Treehugger Robot
19d8dd9085 Merge "Use Module.GetProperties() instead of ModuleBase.generalProperties" am: 25656c401b am: 04c5dcf22a am: 4ed2e665d7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1937381

Change-Id: If51c2c3533b29ec22445bf9a147ff36916b010a2
 2022-01-10 09:43:48 +00:00
Treehugger Robot
25656c401b Merge "Use Module.GetProperties() instead of ModuleBase.generalProperties" 2022-01-10 08:49:17 +00:00