StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,456 Commits 1 Branch 0 Tags
594ed5022a1a6cb53d06b2940546cd1ff6b5f61f
Commit Graph

5781 Commits

Author SHA1 Message Date
Jiakai Zhang
594ed5022a Merge "Allow installing boot images outside of APEX." am: 0cd2a0e2bf am: c1744ee0a0 am: d437de134a am: 91c7d55489 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1947127

Change-Id: Id50d66720662cf5e06b2a8441feab2c5300aaf60
 2022-01-14 18:51:40 +00:00
Jiakai Zhang
0cd2a0e2bf Merge "Allow installing boot images outside of APEX." 2022-01-14 17:31:04 +00:00
Romain Jobredeaux
cd41dd5c33 Merge "Revert "Add static_libs support to android_app bp2build converter."" am: 8a9a97b4a0 am: 474eddd20b am: 9b36f4b981 am: c19a2c16bd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1948756

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

Change-Id: I253922076c5eb0e947bcc6948987b8d38e9c4f06
 2022-01-13 16:02:34 +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
Jiakai Zhang
6decef916c Allow installing boot images outside of APEX. 
After this change, `bootImageConfig.installDirOnDevice` can be set to a
path outside of the APEX, in which case, the boot image will not be
installed in the APEX. Instead, it will be installed to the given path
by Make.

This is a no-op change. Current behavior is not affected.

Bug: 211973309
Test: m nothing
Test: -
  1. m com.android.art
  2. See the boot image still being installed in the ART APEX.
Test: -
  1. Change `installDirOnDevice` of the ART boot image config to
     `system/framework`.
  2. See the boot image being installed in `/system/framework/<arch>`.
Change-Id: Ib13b17cc9e94dc5754c9b51b04df3307323b8783
 2022-01-13 14:50:05 +00:00
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
da88a2599a Merge "Prevent using android_app_import in instrumentation_for property" 2022-01-13 11:56:52 +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
be63328574 Merge "Add java_fuzz_packaging" 2022-01-13 01:22:16 +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
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
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
adf1b2a2cd Merge "Add SetProperties to json-module-graph" 2022-01-12 13:23:33 +00:00
Wei Li
1d0f46e58d Merge "Add new property "exclude_files_in_output" for excluding files from the output files of Java related modules." am: 9ab9437b40 am: b2ee4a8aa0 am: 6cf2fdb71e am: b55a98dd1f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1944246

Change-Id: Ide374c607d6cee008a3732c3d19a581319cbaeab
 2022-01-12 10:38:34 +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
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
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
Paul Duffin
53a70a4870 Prevent using android_app_import in instrumentation_for property 
Previously, referencing a prebuilt android_app_import in an
android_test's instrumentation_for property instead of the source
android_app module (e.g. because the prebuilt is preferred) could
result in compilation errors if the android_test sources depended on
classes from the app. That is because while the android_app provides a
classes jar file to be added to the android_test's classpath the
android_app_import does not.

This change reports that situation as an error.

Bug: 207128192
Test: m nothing
Change-Id: I26ea90e7a3f57707fc0c094e0d8b8dc9a9e135ac
 2022-01-11 14:47:38 +00:00
Ian Zerny
c668a692dc Merge "Add mapping id to source file information for R8 full-mode builds." am: a52cbd67a3 am: 587380225f am: 2a79ac7356 am: 9fef1137fa 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1878501

Change-Id: I9be5ad895dfd07bbba6fd99aa5cc7934c97cb4b8
 2022-01-11 08:12:58 +00:00
Treehugger Robot
d887d9b452 Merge changes I9ad66ea2,I4c95b77b am: 57271b9f45 am: a7c0107744 am: 16213c6bbe am: f7e9e1f434 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1934955

Change-Id: I5e05dbd3bca3c14bb52ad383c8af3eaf491222a1
 2022-01-11 08:11:46 +00:00
Ian Zerny
a52cbd67a3 Merge "Add mapping id to source file information for R8 full-mode builds." 2022-01-11 07:20:50 +00:00
TreeHugger Robot
2715e898c5 Merge "Revert "Add new property "exclude_files_in_output" for excluding files from the output files of Java related modules."" 2022-01-11 06:59:28 +00:00
Treehugger Robot
57271b9f45 Merge changes I9ad66ea2,I4c95b77b 
* changes:
  Make android_app.stem overridable
  Use 'stem' to override APK name
 2022-01-11 06:38:25 +00:00
Josh Wu
3964ce02ff Revert "Add new property "exclude_files_in_output" for excluding files from the output files of Java related modules." 
This reverts commit 21f7ae0828.

Reason for revert: b/213966211

Change-Id: I697739697221d6f821eeda33a434cfcae9d651bf
 2022-01-11 05:12:15 +00:00
Keyi Gui
4ca4920558 Merge "Update droidstubs to support putting action inputs/outputs into the module-graph.json." am: f4bf09feba am: 23b9e124ee am: 9deb64462b am: ef93fb88fa 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1940894

Change-Id: I350f71148aaae2509fb22f0cfd3767fd2509a7a7
 2022-01-11 05:00:48 +00:00
Jooyung Han
01d80d8b4b Make android_app.stem overridable 
override_android_app can set "stem" property to set the APK name.

Bug: 193504286
Test: m (soong test)
Change-Id: I9ad66ea28bd1b030cb2c588d1f070d72e62ab1c7
 2022-01-11 13:07:44 +09:00
Jooyung Han
29e2f6d2c4 Use 'stem' to override APK name 
When android_app.stem is set, use it as the APK name like other module
types.

Bug: 193504286
Test: m (soong test)
Change-Id: I4c95b77be382cff3cfecaf6ce38f99aed9f3238f
 2022-01-11 13:03:49 +09:00
Keyi Gui
f4bf09feba Merge "Update droidstubs to support putting action inputs/outputs into the module-graph.json." 2022-01-11 03:33:01 +00:00
Wei Li
35e63630ca Merge "Add new property "exclude_files_in_output" for excluding files from the output files of Java related modules." 2022-01-11 00:32:25 +00:00
Sam Delmerico
dd3673739c Merge "Convert javacflags -> javacopts for java_binary_host" am: 88a1b9da85 am: a3b597cacb am: e73c046d05 am: 0d9bf06f35 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1940313

Change-Id: I9577f8aecd332c8b49c7219634a24c668d110a65
 2022-01-10 22:53:50 +00:00
Wei Li
21f7ae0828 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-10 14:01:12 -08:00
Keyi
fe310a9305 Update droidstubs to support putting action inputs/outputs into the module-graph.json. 
Test: local test

Change-Id: I6ce657f2ad53c261bcbdd317c266cf179a0cc6e9
 2022-01-10 21:28:37 +08:00
Ian Zerny
fc7df6124f Add mapping id to source file information for R8 full-mode builds. 
Bug: 204293621
Test: atest --host r8retrace-check-retraced-stacktrace
Change-Id: I09703cfaab72350efe67217be9e2d37988218f4d
 2022-01-10 08:56:19 +01:00
Romain Jobredeaux
de722acd96 Add static_libs support to android_app bp2build converter. 
With this change we can allow list WifiDirectDemo, as its dependencies
happen to have manual BUILD file conversions.

Test: ./build/bazel/scripts/run_presubmits.sh
Change-Id: I68b4c2b129fe750913f013384c87a5332fdcc9b6
 2022-01-07 16:47:14 -05:00
Sam Delmerico
4e27229b61 Convert javacflags -> javacopts for java_binary_host 
This has already been done for java_library modules, we need to add
similar support for java_binary_host.

Bug: 213456294
Test: go test ./bp2build
Change-Id: Idf7b631f3afe9f59e50f9e45bcbdc29fb5923cc6
 2022-01-06 21:00:46 +00:00
Treehugger Robot
fe74791982 Merge "Rename updatable-library to apex-library" 2022-01-06 18:41:10 +00:00
Muhammad Haseeb Ahmad
32f86e50ef Merge "Add java_fuzz module to build java fuzzers" am: b5f43ac373 am: 9a03218fec am: 6474e4c716 am: eca54b9726 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1935617

Change-Id: I0eb8d2b9a8d49576ab2491ce778c8b043e971b9d
 2022-01-06 17:19:10 +00:00
Muhammad Haseeb Ahmad
b5f43ac373 Merge "Add java_fuzz module to build java fuzzers" 2022-01-06 16:08:46 +00:00
Pedro Loureiro
196d3e6b6b Rename updatable-library to apex-library 
Mostly for consistency with the names used in related changes.

Test: m nothing

Bug: 191978330
Change-Id: I34637986ead1c671bcc649891aceb3fe0f44b52a
 2022-01-06 10:33:42 +00:00
Pedro Loureiro
0ca76705b7 Merge "Rename updatable-library to apex-library" 2022-01-06 09:04:04 +00:00
Muhammad Haseeb Ahmad
aa1d0cf775 Add java_fuzz module to build java fuzzers 
This change adds a new module to soong to be able to build Java fuzz
targets be able to run using Jazzer. Jazzer is an open source fuzzing engine
supported by OSS-Fuzz.

Bug: 211671266
Test: go test -run TestJavaFuzz
Change-Id: Id7c346694f5986f6e15210c359fd533fbb7001eb
 2022-01-06 02:17:34 +00:00
Michael Rosenfeld
f40832df02 Merge "Extract assets from AAR imports and their dependencies." am: 3babe3f6b6 am: e773e9743f am: cfec7239d8 am: b9cbdd0ca9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1931927

Change-Id: I32fe0d9d306f8974e32dc0ff82390de73033a812
 2022-01-05 21:04:58 +00:00
Michael Rosenfeld
5ad155783f Extract assets from AAR imports and their dependencies. 
Bug: 188837446
Test: manual

Change-Id: I73bd5410fc7b069f727289c5d927ea48e87db6e2
 2022-01-05 01:44:20 +00:00
Jiakai Zhang
b9fcf355a1 Merge "Update dexpreopt_check to check all system server jars." am: 59571ddf67 am: 9758103119 am: 8f9664b188 am: f2d6aea0d4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1930899

Change-Id: Ieb093f9c663d02f79ab92d110ff67fd2bd4d3087
 2021-12-22 22:01:41 +00:00
Pedro Loureiro
0493165fde Rename updatable-library to apex-library 
Mostly for consistency with the names used in related changes.

Test: m nothing

Bug: 191978330
Change-Id: I34637986ead1c671bcc649891aceb3fe0f44b52a
 2021-12-22 19:53:01 +00:00
Jiakai Zhang
d806dd4f1d Update dexpreopt_check to check all system server jars. 
After this change, standalone system server jars will also be checked.

Bug: 203198541
Test: m nothing
Change-Id: I80f5efe9c7f0386af175d7a37398ffa000d6ba59
 2021-12-21 12:51:36 +00:00