StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
72,155 Commits 1 Branch 0 Tags
b29d829e6b507a9446499ce04263fc453572738c
Commit Graph

72155 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Liz Kammer
b29d829e6b Merge "Change openjdk9 specific props in bp2build/Soong" into main am: c723757dd7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776469

Change-Id: I8a7442b9c93d2888c0f4cf3c99ffd817a3cce305
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-12 20:22:38 +00:00
Liz Kammer
c723757dd7 Merge "Change openjdk9 specific props in bp2build/Soong" into main 2023-10-12 19:47:38 +00:00
Cole Faust
871d783c17 Merge "Fix TestPrebuiltRootHostWithWildCardInSrc" into main am: ad35c57288 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2786922

Change-Id: I4cb283439c1e2b1ed35018f8d958c49d87ad56fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-12 18:54:55 +00:00
Cole Faust
ad35c57288 Merge "Fix TestPrebuiltRootHostWithWildCardInSrc" into main 2023-10-12 18:30:56 +00:00
Jihoon Kang
632dd0ca85 Merge changes from topic "enable-hidden-api" into main am: e100a884e3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2617274

Change-Id: I2840b6d745b8bd0e032c34dda364ac6378da9f74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-12 17:38:48 +00:00
Zi Wang
e2d26d0839 Merge "Support prebuilt_root_host in bp2build" into main am: 7c81b2b245 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2782249

Change-Id: I6fc4d02643f2fed70661f4c42185824372d884d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-12 17:34:02 +00:00
Jihoon Kang
e100a884e3 Merge changes from topic "enable-hidden-api" into main 
* changes:
  Enable hiddenapi check for from-text stub build
  Utilize module lib and test api superset module in hiddenapi
 2023-10-12 17:33:35 +00:00
Zi Wang
7d54b3a5d8 Fix TestPrebuiltRootHostWithWildCardInSrc 
Test: CI
Change-Id: Ia39ac3217fa827fec4c6e572e49c49c15e126109
 2023-10-12 10:25:31 -07:00
Zi Wang
7c81b2b245 Merge "Support prebuilt_root_host in bp2build" into main 2023-10-12 17:10:21 +00:00
Cole Faust
e93a697a16 Merge "Denylist CompilationTestCases_package-dex-usage" into main am: 4e234c99fb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2786979

Change-Id: I4b9d14201b21705e49a479d6115da40563b0e09c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-12 16:58:26 +00:00
Cole Faust
252d2fdb46 Merge "Add out/partitions_were_clean_at_start_of_build.txt" into main am: 14645b284d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2773848

Change-Id: Ib3863a3f127b9f698169884ba20fa75c441881f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-12 16:57:20 +00:00
Cole Faust
4e234c99fb Merge "Denylist CompilationTestCases_package-dex-usage" into main 2023-10-12 16:57:00 +00:00
Cole Faust
3af559c9ce Denylist CompilationTestCases_package-dex-usage 
I'm not sure how this was missed earlier.

Bug: 290816499
Test: build/soong/tests/genrule_sandbox_test.py -t sdk_phone_x86_64 all with aosp/2666142
Change-Id: I8d21a34e3b13ac568fa6153a31c43ba3e4d516bd
 2023-10-12 09:54:53 -07:00
Cole Faust
14645b284d Merge "Add out/partitions_were_clean_at_start_of_build.txt" into main 2023-10-12 16:33:11 +00:00
Liz Kammer
9f52f6ba60 Change openjdk9 specific props in bp2build/Soong 
JDK17 is the default java version, adding these props conditionally
openjdk9 is no longer relevant

Test: CI
Change-Id: I5d80fd22f474cedf389d1e295620cfc17bc327a0
 2023-10-12 09:57:04 -04:00
Ivan Lozano
1b5dad971a Merge "rust: Temporarily disable ASAN builds for Host" into main am: 91738fddb3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2784547

Change-Id: Ife9730263942475b5ab43f7162d96bcfacce8ea9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-12 13:22:23 +00:00
Ivan Lozano
91738fddb3 Merge "rust: Temporarily disable ASAN builds for Host" into main 2023-10-12 12:53:43 +00:00
Ian Zerny
44c234ecf1 Merge "Ignore dex files in input archives" into main am: 57beac1b76 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2780987

Change-Id: I03ed4ba47e88a1e62ac2a348635dd7a11ee3f7a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-12 07:00:51 +00:00
Ian Zerny
57beac1b76 Merge "Ignore dex files in input archives" into main 2023-10-12 06:27:02 +00:00
Alix Espino
a51e83ac06 Merge "Use an option struct in aapt.buildActions & manifestMerger" into main am: 37e64f9c91 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769926

Change-Id: I5438d2f0cd250fdaf81dcf75b2bf257e79822cca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-12 03:24:23 +00:00
Alix Espino
37e64f9c91 Merge "Use an option struct in aapt.buildActions & manifestMerger" into main 2023-10-12 02:53:10 +00:00
Jingwen Chen
3781b3c72d Merge "Move platform constraints to bazel_common_rules." into main am: a4c330e076 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2781283

Change-Id: I172e78152870ec4eee21823b69282728a2308168
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-12 02:34:50 +00:00
Jingwen Chen
a4c330e076 Merge "Move platform constraints to bazel_common_rules." into main 2023-10-12 02:22:26 +00:00
Treehugger Robot
bb2d733f22 Merge "TestJavaHostGeneral Fix" into main am: 452b794c33 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2782251

Change-Id: I5afbed1ebdecea2286247092bb46b655b7e54a5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-12 01:44:46 +00:00
Ramy Medhat
c0aa94c17a Merge "Set download_tmp_dir explicitly to be a directory under the output directory." into main am: 67b4973126 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2781987

Change-Id: Ib7c036acd04cbef3684818ae2b00b1af0a17e861
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-12 01:43:57 +00:00
Treehugger Robot
452b794c33 Merge "TestJavaHostGeneral Fix" into main 2023-10-12 01:37:32 +00:00
Ramy Medhat
67b4973126 Merge "Set download_tmp_dir explicitly to be a directory under the output directory." into main 2023-10-12 01:05:18 +00:00
Krzysztof Kosiński
029d1673d7 Merge "Revert "Enable -Werror=incompatible-function-pointer-types"" into main am: 69101d699c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2784488

Change-Id: I2fddf652c8ce52a58e8b83c44144012ea45911b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-11 23:49:21 +00:00
Krzysztof Kosiński
69101d699c Merge "Revert "Enable -Werror=incompatible-function-pointer-types"" into main 2023-10-11 23:16:07 +00:00
Ramya Subramanian
5e75975e04 Revert "Enable -Werror=incompatible-function-pointer-types" 
This reverts commit 07c362bf7f.

Reason for revert: DroidMonitor: Potential culprit for Bug 304839693 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.”.

Change-Id: Iafb894510c48af2dd8b015d7264a031ff9348884
 2023-10-11 23:00:33 +00:00
Treehugger Robot
3cb380098a Merge "Sort genrule allowlists" into main am: 154cf29b57 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2782250

Change-Id: I0a7d66190e97c5612199f48615552dce34060a05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-11 22:47:29 +00:00
Treehugger Robot
83ea7f6030 Merge "Use make_mock_top function" into main am: 36674db0b3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775287

Change-Id: I3be6273b8b92d3be9351e601d6ac280d624d36f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-11 22:47:06 +00:00
Alix
42d7ac96bc TestJavaHostGeneral Fix 
This fixes "expected 2 bazel modules in "." but did not find any"
error that the test was getting.

Test: got test ./bp2build
Change-Id: I376c7c9974d301fc85894ecf2b0838c863a74a47
 2023-10-11 22:39:27 +00:00
Treehugger Robot
154cf29b57 Merge "Sort genrule allowlists" into main 2023-10-11 22:35:21 +00:00
Treehugger Robot
36674db0b3 Merge "Use make_mock_top function" into main 2023-10-11 22:10:48 +00:00
Jihoon Kang
8f9d036314 Merge "Retain concrete overrides of abstract methods by default" into main am: c5be9361b6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2781328

Change-Id: If490466468e4136d52a09e411ce36f7d893245b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-11 21:09:38 +00:00
Jihoon Kang
fbe7a9e772 Merge changes I804d3597,I6a25e2f6 into main am: faf7251c7b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2779190

Change-Id: I3c35421afcf6fa733b7b13b1a425b739981b12c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-11 21:08:21 +00:00
Mark Dacek
ae811fe098 Merge "Add b_args_test." into main am: 360e8ebbff 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776568

Change-Id: I3d3c25df66fb137b20a79b362a354dab26442e05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-11 21:08:05 +00:00
Jihoon Kang
c5be9361b6 Merge "Retain concrete overrides of abstract methods by default" into main 2023-10-11 21:02:17 +00:00
Jihoon Kang
faf7251c7b Merge changes I804d3597,I6a25e2f6 into main 
* changes:
  Add module dependency checking testing method
  Add droidstub modules for Soong java testing
 2023-10-11 20:43:48 +00:00
Mark Dacek
360e8ebbff Merge "Add b_args_test." into main 2023-10-11 20:37:37 +00:00
Krzysztof Kosiński
58453a7a41 Merge "Enable -Werror=incompatible-function-pointer-types" into main am: 7158f66753 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2715335

Change-Id: I1da83d17b1915f884d4460352af57b063883cf99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-11 19:43:16 +00:00
Cole Faust
dc3c1454fa Sort genrule allowlists 
To avoid merge conflicts.

Bug: 290816499
Test: Presubmits
Change-Id: I8f8ba5112ae87c21dd95513ee1cf0d3d16bccf3f
 2023-10-11 12:37:25 -07:00
Zi Wang
040541496a Support prebuilt_root_host in bp2build 
Also fix a bug that filename string may contain wild card

Test: Added unittest and CI

Bug: 303725325
Bug: 304590341
Change-Id: I5de9c195343328981a4154024c0fe4e14969ce79
 2023-10-11 12:16:26 -07:00
Krzysztof Kosiński
7158f66753 Merge "Enable -Werror=incompatible-function-pointer-types" into main 2023-10-11 19:01:42 +00:00
Yu Liu
8a5b48e26d Merge "Change java_test_host to support cov variant." into main am: 0bf0865f83 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776007

Change-Id: I0c5a1a2c60d486b0b3b91613fa83cf0c4c20cfe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-11 17:49:58 +00:00
Jihoon Kang
dff2aea212 Enable hiddenapi check for from-text stub build 
This change removes the UNSAFE_DISABLE_HIDDENAPI_FLAGS env var setting
during from-text stub build, and enables hiddenapi list during from-text
stub build.

Test: ENABLE_HIDDENAPI_FLAGS=true m --build-from-text-stub
Bug: 275570206
Change-Id: Ic8cd60e376b978ccc658ff43a44d082eb2759fa5
 2023-10-11 17:46:29 +00:00
MarkDacek
055a1207ad Add b_args_test. 
Bug: 303269101
Test: run the test
Change-Id: I2c5e72d25dab601ef7354fb9ad624ce035e64812
 2023-10-11 17:27:29 +00:00
Ivan Lozano
839b5f9ac5 rust: Temporarily disable ASAN builds for Host 
This is breaking sanitized host builds. Disable the sanitizer in Rust
for host targets until this can be resolved.

Bug: 304507701
Test: SANITIZE_HOST=address m rust
Change-Id: I12b0c3e217717de7a89b32198f4c4729709e99b3
 2023-10-11 13:18:37 -04:00
Jihoon Kang
244d42a91b Utilize module lib and test api superset module in hiddenapi 
Hiddenapi takes a single widest api scope stub dex jar as an input, as
the tool does not support handling duplicate classes passed as inputs.
A problem regarding this is that the test and module lib api surfaces do
not strictly have a subset/superset relationship, unlike other api
surfaces.

This has not become a problem for stubs generated from source
files as the stubs contain all methods in the source files, but became a
problem for stubs genereated from text files as the stubs only contain
the methods that are essential for compilation of the stubs and its
reverse dependencies, and there were cases where the hiddenapi flags are
not properly propagated to the subclasses.

To resolve this problem, a java_api_library module that provides the
union of the test and the module lib api surfaces was introcudes. Since
hiddenapi_modular currently defines the module lib api surface to be a
wider api scope over the test api scope, the new module can be passed as
input to hiddenapi over the module lib non updatable stub module to
resolve the problem.

Test: enable hiddenapi for from-text stub build && ENABLE_HIDDENAPI_FLAGS=true m --build-from-text-stub
Bug: 191644675
Bug: 275570206
Change-Id: I9a230ec5082c52ed866f29b0748814f2cf10279b
 2023-10-11 17:06:23 +00:00