Commit Graph

54414 Commits

Author SHA1 Message Date
Paul Duffin
ad103d80ba Merge "Prevent using android_app_import in instrumentation_for property" am: da88a2599a am: 4a2fbb6a17 am: 2c7ba94992 am: 7d009dd8a8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1945101

Change-Id: I6d020f9267740539ed45d479792847dff17741dc
2022-01-13 12:54:14 +00:00
Paul Duffin
7d009dd8a8 Merge "Prevent using android_app_import in instrumentation_for property" am: da88a2599a am: 4a2fbb6a17 am: 2c7ba94992
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1945101

Change-Id: Ic36a72fd6ee00eb3737bcc161da49c657b7a9551
2022-01-13 12:39:53 +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
f0a0efdd12 Merge "Fix genrule tool dependencies when a prebuilt tool is preferred." am: 3a1a4b070e am: 6656d4671a am: e163811966 am: e6ccbe1336
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1946708

Change-Id: I739fa249f430908848325998fb27477f0335003a
2022-01-13 08:39:30 +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
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
460fb09b8f Merge "Generate tidy-* rules unless tidy is disabled" am: de232dbed2 am: 4aa5d42131 am: 157ff7a0b2 am: eb11b15a67
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1943872

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

Change-Id: I5ee6b7beb488ce53f44c71d5696810d91e9dc8e8
2022-01-13 04:44:52 +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
bc0ad4ffb6 Merge "Add java_fuzz_packaging" am: be63328574 am: 6b0cfa88ea am: f449abc292 am: 725085406e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1943870

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

Change-Id: Ib405482683f75b112353b7d6f845c3dc526ef6a8
2022-01-13 02:09:27 +00:00
Muhammad Haseeb Ahmad
725085406e Merge "Add java_fuzz_packaging" am: be63328574 am: 6b0cfa88ea am: f449abc292
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1943870

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

Change-Id: Idf6ac685656ac1377b218cb203f26f285e83b55d
2022-01-13 01:57:29 +00:00
Treehugger Robot
ecb720b946 Merge "[coverage] Override -Wframe-larger-than" am: 757feca3ed am: 1d8479e882 am: 988f0a87a6 am: d96af8213a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1947487

Change-Id: I762b7956c60841aabe926118e176c9d628acd8cb
2022-01-13 01:45:51 +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
Treehugger Robot
d96af8213a Merge "[coverage] Override -Wframe-larger-than" am: 757feca3ed am: 1d8479e882 am: 988f0a87a6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1947487

Change-Id: Iff0284ce6a1f625e9c5f95bc468d4a17d2dd0624
2022-01-13 01:26:36 +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
Sam Delmerico
c530cfe005 Merge "Support enabled flag in product variable config" am: 443703ab32 am: 0b75591af3 am: f76b955589 am: 099abc955e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1944064

Change-Id: I6be4646c7c1378b076185e67cdab279ab6447cf8
2022-01-12 21:35:37 +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
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
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
a2ba7e53f8 Merge "Add SetProperties to json-module-graph" am: adf1b2a2cd am: b6fdee8f0a am: bbd97028b8 am: 4d7be9bab5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1937639

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

Change-Id: Ib4eef6beb896c9586a0fdf9a3d45179447fbb553
2022-01-12 14:18:03 +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
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