StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,817 Commits 1 Branch 0 Tags
9b36f4b981a59070a4cabda6da7ed42b00e91f45
Commit Graph

47817 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Jobredeaux
9b36f4b981 Merge "Revert "Add static_libs support to android_app bp2build converter."" am: 8a9a97b4a0 am: 474eddd20b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1948756

Change-Id: I898babb662e093d27b5df59ee938a6c2a7102cc0
 2022-01-13 17:32:52 +00:00
Romain Jobredeaux
474eddd20b Merge "Revert "Add static_libs support to android_app bp2build converter."" am: 8a9a97b4a0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1948756

Change-Id: I45884aedee5ec04a9bd3e91211de815fc63432d4
 2022-01-13 17:21:01 +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
519e09f11d Merge "Add static_libs support to android_app bp2build converter." am: 24431448b2 am: 6eae04a33f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1917405

Change-Id: Idc751da537e6f51befca4df276016004023dc6e3
 2022-01-13 15:26:32 +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
6eae04a33f Merge "Add static_libs support to android_app bp2build converter." am: 24431448b2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1917405

Change-Id: I251b3e88e796db35d63e086e5f65e119c9b5fb73
 2022-01-13 15:15:05 +00:00
Romain Jobredeaux
24431448b2 Merge "Add static_libs support to android_app bp2build converter." 2022-01-13 15:00:44 +00:00
Paul Duffin
2c7ba94992 Merge "Prevent using android_app_import in instrumentation_for property" am: da88a2599a am: 4a2fbb6a17 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1945101

Change-Id: I796a62b61437bb8fccd5b0c1a6e079b2ef0f0a23
 2022-01-13 12:29:36 +00:00
Paul Duffin
4a2fbb6a17 Merge "Prevent using android_app_import in instrumentation_for property" am: da88a2599a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1945101

Change-Id: I02534dfeaaa7e863421300831a0a4a2704d5b848
 2022-01-13 12:13:16 +00:00
Paul Duffin
da88a2599a Merge "Prevent using android_app_import in instrumentation_for property" 2022-01-13 11:56:52 +00:00
Martin Stjernholm
e163811966 Merge "Fix genrule tool dependencies when a prebuilt tool is preferred." am: 3a1a4b070e am: 6656d4671a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1946708

Change-Id: Ibdde2fed1b43a945c5f5001e69f2b908cff0e48b
 2022-01-13 08:14:57 +00:00
Martin Stjernholm
6656d4671a Merge "Fix genrule tool dependencies when a prebuilt tool is preferred." am: 3a1a4b070e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1946708

Change-Id: I1db48e5fffad41cf2308c80ef0c70da48c072e22
 2022-01-13 07:57:19 +00:00
Martin Stjernholm
3a1a4b070e Merge "Fix genrule tool dependencies when a prebuilt tool is preferred." 2022-01-13 07:43:15 +00:00
Treehugger Robot
157ff7a0b2 Merge "Generate tidy-* rules unless tidy is disabled" am: de232dbed2 am: 4aa5d42131 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1943872

Change-Id: Id69da964b37d2213238dfb6340ff3ebdd717f5f0
 2022-01-13 04:27:03 +00:00
Treehugger Robot
4aa5d42131 Merge "Generate tidy-* rules unless tidy is disabled" am: de232dbed2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1943872

Change-Id: Ifebeab24a5eba14a7bf1df56d3a303a7e872836a
 2022-01-13 04:09:37 +00:00
Treehugger Robot
de232dbed2 Merge "Generate tidy-* rules unless tidy is disabled" 2022-01-13 03:46:37 +00:00
Muhammad Haseeb Ahmad
f449abc292 Merge "Add java_fuzz_packaging" am: be63328574 am: 6b0cfa88ea 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1943870

Change-Id: I74408994806a0c22f0adac93e309b026e05e0e2d
 2022-01-13 01:45:34 +00:00
Wei Li
5404c75493 Merge "Correct the comments on property exclude_kotlinc_generated_file, which defaults to false actually." am: 3842a91f54 am: 702c570b45 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1947488

Change-Id: If10e6cca4c3ab157b061b2808cc5d0828b46e7c2
 2022-01-13 01:45:13 +00:00
Muhammad Haseeb Ahmad
6b0cfa88ea Merge "Add java_fuzz_packaging" am: be63328574 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1943870

Change-Id: I90afc3adc97118ec5f2d1d855a7e9b4a2ff89e21
 2022-01-13 01:27:42 +00:00
Wei Li
702c570b45 Merge "Correct the comments on property exclude_kotlinc_generated_file, which defaults to false actually." am: 3842a91f54 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1947488

Change-Id: I71e9c7bdd1ffd38fd6b03405a674d03dd89c9920
 2022-01-13 01:27:30 +00:00
Muhammad Haseeb Ahmad
be63328574 Merge "Add java_fuzz_packaging" 2022-01-13 01:22:16 +00:00
Wei Li
3842a91f54 Merge "Correct the comments on property exclude_kotlinc_generated_file, which defaults to false actually." 2022-01-13 01:10:01 +00:00
Treehugger Robot
988f0a87a6 Merge "[coverage] Override -Wframe-larger-than" am: 757feca3ed am: 1d8479e882 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1947487

Change-Id: I82ccdc13db578d4649499f44d909aabacfa3ecc8
 2022-01-13 01:09:05 +00:00
Treehugger Robot
1d8479e882 Merge "[coverage] Override -Wframe-larger-than" am: 757feca3ed 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1947487

Change-Id: If3faad21e31775b29680fd7cccca9c63b733d575
 2022-01-13 00:51:00 +00:00
Chih-Hung Hsieh
7540a78a35 Generate tidy-* rules unless tidy is disabled 
* make tidy-soong_subset, or make tidy-<any_directory>,
  should trigger the same clang-tidy compilations
  with or without global WITH_TIDY=1.
* Normal make should not trigger clang-tidy compilations
  unless global WITH_TIDY=1 or a module has set tidy:true.

Bug: 213918926
Test: NINJA_ARGS="-n" make tidy-soong_subset
Test: NINJA_ARGS="-n" make <some-library>
Change-Id: Iafffd3894abe137c9584c2c01830898422f9a677
 2022-01-12 16:48:40 -08:00
Treehugger Robot
757feca3ed Merge "[coverage] Override -Wframe-larger-than" 2022-01-13 00:38:20 +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
Wei Li
92cd54b29d Correct the comments on property exclude_kotlinc_generated_file, which defaults to false actually. 
Bug: 204888276
Test: Treehugger

Change-Id: Ib0405395da9a8cf8dd7bb1983fcd13425fe69b34
 2022-01-12 13:27:36 -08:00
Sam Delmerico
f76b955589 Merge "Support enabled flag in product variable config" am: 443703ab32 am: 0b75591af3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1944064

Change-Id: I9f6bd8322cd23056a9d27ec3ef9cdad897722ece
 2022-01-12 21:07:00 +00:00
Sam Delmerico
0b75591af3 Merge "Support enabled flag in product variable config" am: 443703ab32 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1944064

Change-Id: I4c5f06b7cc953b86e15754891c95867a0d04ebc6
 2022-01-12 20:51:16 +00:00
Sam Delmerico
443703ab32 Merge "Support enabled flag in product variable config" 2022-01-12 20:34:14 +00:00
Pirama Arumuga Nainar
e6840726bd [coverage] Override -Wframe-larger-than 
Bug: http://b/214221000
Bug: http://b/194128476

Adding `-mllvm -runtime-counter-relocation` for continuous coverage has
caused -Wframe-larger-than warnings when linking libart.  These warnings
need not be enforced on coverage builds, so override the flag.

Test: NATIVE_COVERAGE_PATHS=art CLANG_COVERAGE=true m libart;
      also go/abtd on failing target.
Change-Id: I8f5ac725ff5c674e6dd0831136d3d8b2e42b0428
 2022-01-12 11:52:26 -08:00
Muhammad Haseeb Ahmad
e380310a9e Add java_fuzz_packaging 
java_fuzz_package is a prelude to a haiku-java build target.

Test: m example_java_fuzzer
Change-Id: I78caa53d7687e24f7180c7e16013b668991d6fe6
 2022-01-12 18:48:39 +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
bbd97028b8 Merge "Add SetProperties to json-module-graph" am: adf1b2a2cd am: b6fdee8f0a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1937639

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

Change-Id: I891071f00aac6171f9ccac51ccbbeb86e30a7fbc
 2022-01-12 13:54:14 +00:00
Liz Kammer
b6fdee8f0a Merge "Add SetProperties to json-module-graph" am: adf1b2a2cd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1937639

Change-Id: Ibbb048f90c36f6b46210011adf886806147e00f3
 2022-01-12 13:42:27 +00:00
Liz Kammer
86151370ef Merge "Revert "Revert "bp2build: convert host & prebuilt header libraries""" am: e844132b85 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1944329

Change-Id: Idb9f90322fa87ce3b8cf3f5ce88f34caeb62ff02
 2022-01-12 13:41:57 +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
Wei Li
6cf2fdb71e Merge "Add new property "exclude_files_in_output" for excluding files from the output files of Java related modules." am: 9ab9437b40 am: b2ee4a8aa0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1944246

Change-Id: Icf986d08e6dccca4ba48bce616bd2bba65d87e2f
 2022-01-12 10:01:48 +00:00
Wei Li
b2ee4a8aa0 Merge "Add new property "exclude_files_in_output" for excluding files from the output files of Java related modules." am: 9ab9437b40 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1944246

Change-Id: I000e2f69a60e1d04ef141473cb9c09e0341ed42a
 2022-01-12 09:44:12 +00:00
Wei Li
9ab9437b40 Merge "Add new property "exclude_files_in_output" for excluding files from the output files of Java related modules." 2022-01-12 09:25:22 +00:00
Treehugger Robot
efd9d246e6 Merge "Remove self from OWNERS" am: e751b5355e am: 7b042a2500 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1939233

Change-Id: I8d8c4944d71026d412d53802e0dc6b30728553dd
 2022-01-12 02:11:37 +00:00
Treehugger Robot
7b042a2500 Merge "Remove self from OWNERS" am: e751b5355e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1939233

Change-Id: Ia30ffcd2b6c885a1b0e12f778a7ea9e18d6be680
 2022-01-12 01:58:48 +00:00
Treehugger Robot
e751b5355e Merge "Remove self from OWNERS" 2022-01-12 01:45:56 +00:00
Wei Li
1e73c6573e Add new property "exclude_files_in_output" for excluding files from the output files of Java related modules. 
Bug: 204888276
Test: m service-permission
Change-Id: I9f6113834826358b0e3af22ed1dd63a43c255452
 2022-01-11 14:20:16 -08:00
Colin Cross
553f9d26d2 [automerger skipped] [automerge] Revert "Time out and dump stacks from R8 processes after 30 minutes" 2p: b18a037fc6 am: 44c522badf -s ours 
am skip reason: Merged-In Ia0c3826aea3288e9db3bdbd4955e1e16c0a38fe3 with SHA-1 a832a04db2 is already in history

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

Change-Id: I55acd2b880a7dc5efa78cf2f732f3358e7219fd2
 2022-01-11 21:32:55 +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
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