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

72928 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Liz Kammer
1f92c64dcd Merge "Handle java_resources as deps" into main am: b5c3b018d9 am: cd432e7a93 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2778708

Change-Id: I0a25be6a79d438ea0203c550b7c5864e5fb58574
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-12 22:15:53 +00:00
Liz Kammer
cd432e7a93 Merge "Handle java_resources as deps" into main am: b5c3b018d9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2778708

Change-Id: I8d16b122bc785a5cc2c1e34e4a326cd4198d7aca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-12 21:41:35 +00:00
Liz Kammer
b5c3b018d9 Merge "Handle java_resources as deps" into main 2023-10-12 21:10:37 +00:00
Liz Kammer
91d416a75c Merge "Change openjdk9 specific props in bp2build/Soong" into main am: c723757dd7 am: b29d829e6b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776469

Change-Id: I3b0ad4803f43854502ba88d543767f2160d313e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-12 20:51:55 +00:00
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
a0bc781b00 Merge "Fix TestPrebuiltRootHostWithWildCardInSrc" into main am: ad35c57288 am: 871d783c17 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2786922

Change-Id: I77ce30167b509bb774db6f5c5e0f8fd1568f9f75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-12 19:31:19 +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
b37ad3e3fc Merge changes from topic "enable-hidden-api" into main am: e100a884e3 am: 632dd0ca85 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2617274

Change-Id: I18d6dd99fc3b0255c149b5345123fa6faffd784c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-12 18:08:45 +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
114a1c9aec Merge "Support prebuilt_root_host in bp2build" into main am: 7c81b2b245 am: e2d26d0839 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2782249

Change-Id: I5558dd6f7ec332e9baf125144aa083b618f6aeb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-12 17:35:02 +00:00
Cole Faust
168fbb38de Merge "Denylist CompilationTestCases_package-dex-usage" into main am: 4e234c99fb am: e93a697a16 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2786979

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

Change-Id: I954e7f09f0cc5892f46d56d3a9e403762d570267
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-12 17:34:20 +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
93b7e9545e Handle java_resources as deps 
Test: CI && unit tests
Change-Id: I51f3c7d876c3cc25cb0459d933e1a510cfb5bf13
 2023-10-12 09:57:06 -04: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
1e09e06286 Merge "rust: Temporarily disable ASAN builds for Host" into main am: 91738fddb3 am: 1b5dad971a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2784547

Change-Id: Ie737963fcaf0b0883c0253fba7a9f904cecf4e3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-12 13:55:05 +00: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
be0874053a Merge "Ignore dex files in input archives" into main am: 57beac1b76 am: 44c234ecf1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2780987

Change-Id: I7408144c078f2eef7729bd53128e8e9b35104109
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-12 07:33:23 +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
aa0e12c22b Merge "Use an option struct in aapt.buildActions & manifestMerger" into main am: 37e64f9c91 am: a51e83ac06 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769926

Change-Id: I327c89db84f777efe1a2b84b35363501e0701830
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-12 03:57:08 +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
Jingwen Chen
d92dba5ca8 Merge "Move platform constraints to bazel_common_rules." into main am: a4c330e076 am: 3781b3c72d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2781283

Change-Id: I7bfd5148b3fab776a008146eb2f15b7f0c5402c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-12 03:07:12 +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
1b8286437b Merge "TestJavaHostGeneral Fix" into main am: 452b794c33 am: bb2d733f22 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2782251

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

Change-Id: Iee7e821280c9178873d4599feee45471f7deed5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-12 02:16:39 +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
df5754c8a5 Merge "Revert "Enable -Werror=incompatible-function-pointer-types"" into main am: 69101d699c am: 029d1673d7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2784488

Change-Id: I335033907af959ed77efe5534db9df6bf9ec7b2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-12 00:21:03 +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
Treehugger Robot
858f6135d1 Merge "Sort genrule allowlists" into main am: 154cf29b57 am: 3cb380098a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2782250

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

Change-Id: Ibd71ed5d4f8a8f049df4098001da755b76afaa07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-11 23:31:33 +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