StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
67,056 Commits 1 Branch 0 Tags
7a8eb6a09f85c7c79cb1a7f8d1dab5edcca593e8
Commit Graph

67056 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alix Espino
7a8eb6a09f Merge "bp2build kotlinCFlags" am: d184706daa am: 54bfcc938f am: ea66e1bd5d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2486117

Change-Id: Iecf554834e09c97103b054c8726d63715e42395e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 20:02:17 +00:00
Treehugger Robot
c4dbbd6aad Merge "Omit linux_bionic in mixed builds." am: 261bc29678 am: b6c1361030 am: f4a5b8247b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2487575

Change-Id: Ie3ea97752a4c6167ad76dc531970ab95a84e91e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 20:01:55 +00:00
Alix Espino
ea66e1bd5d Merge "bp2build kotlinCFlags" am: d184706daa am: 54bfcc938f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2486117

Change-Id: I7725dfea06af6207f3d830af027b0269d3d3aa24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 19:25:04 +00:00
Treehugger Robot
f4a5b8247b Merge "Omit linux_bionic in mixed builds." am: 261bc29678 am: b6c1361030 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2487575

Change-Id: I154c97992ce6744e882855814017897852613c8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 19:23:56 +00:00
Alix Espino
54bfcc938f Merge "bp2build kotlinCFlags" am: d184706daa 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2486117

Change-Id: I8a547e02ba2a874b7986e41470482daeb4262621
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 18:44:41 +00:00
Treehugger Robot
b6c1361030 Merge "Omit linux_bionic in mixed builds." am: 261bc29678 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2487575

Change-Id: Ib81922cfc45b24cac82f60d429ea70c186221e59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 18:43:38 +00:00
Alix Espino
d184706daa Merge "bp2build kotlinCFlags" 2023-03-14 18:35:15 +00:00
Treehugger Robot
261bc29678 Merge "Omit linux_bionic in mixed builds." 2023-03-14 18:07:17 +00:00
Presubmit Automerger Backend
b8f30a1549 [automerged blank] Add filegroup_defaults module 2p: ac7ec54004 
Blank merge reason: Change-Id I82feac37ae6998313a0004f8af58f3decf7a514e with SHA-1 7d6dd8bb33 is in history

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


Change-Id: I7f7e9c3b8d7cae3cb378d902e35168f51ed9d971
Merged-In: I82feac37ae6998313a0004f8af58f3decf7a514e
 2023-03-14 16:04:40 +00:00
Anton Hansson
ac7ec54004 Add filegroup_defaults module 
Allows specifying shared filegroup attributes in a central place.

Test: filegroup_test.go
Change-Id: I82feac37ae6998313a0004f8af58f3decf7a514e
(cherry picked from https://android-review.googlesource.com/q/commit:7d6dd8bb3324e81b5c4afc80b062baad2fed1770)
Merged-In: I82feac37ae6998313a0004f8af58f3decf7a514e
 2023-03-14 16:04:30 +00:00
Liz Kammer
11ec91f652 Omit linux_bionic in mixed builds. 
We do not have toolchains set up for linux bionic at this time.

Bug: 273425275
Test: CI
Change-Id: I72760eabeb7be28f176eaaf4c6b9954dfdca1e42
 2023-03-14 10:03:38 -04:00
Alix
f848bf8225 bp2build kotlinCFlags 
for java_library, java_binary, android_app & android_library

Change-Id: Ia8dec7e7d497eb41b2d8dcd8c44c3090d1d3b4bd
Bug: 271265771
Test: go test ./bp2build
 2023-03-14 13:57:22 +00:00
Anton Hansson
0bcbdd8e1b [automerged blank] Add filegroup_test.go to sources 2p: dfe8dca369 
Blank merge reason: Change-Id Ia3bf53ddcc1ddefd7a236122256594ba764ee8e5 with SHA-1 7a444cec60 is in history

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


Change-Id: I6878057ff954ea3636c1e074a066dcc53c92f7f7
Merged-In: Ia3bf53ddcc1ddefd7a236122256594ba764ee8e5
 2023-03-14 13:53:34 +00:00
Anton Hansson
467fee3520 Merge "Add filegroup_defaults module" am: a8c1cacaf9 am: 03c2e249ee am: bde188be81 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2470485

Change-Id: Iacf5b384c2ff3f148487989867415300dff287eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 13:50:52 +00:00
Anton Hansson
bde188be81 Merge "Add filegroup_defaults module" am: a8c1cacaf9 am: 03c2e249ee 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2470485

Change-Id: I21858217d479720735df11dbc8833c24d5d4d1bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 13:13:32 +00:00
Anton Hansson
03c2e249ee Merge "Add filegroup_defaults module" am: a8c1cacaf9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2470485

Change-Id: I5a821648fdc3245af62c16b2731a17a53303f2b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 12:37:37 +00:00
Anton Hansson
dfe8dca369 Add filegroup_test.go to sources 
I don't think it was running before.

Test: yes
Change-Id: Ia3bf53ddcc1ddefd7a236122256594ba764ee8e5
(cherry picked from https://android-review.googlesource.com/q/commit:7a444cec60ec4e70d6c8581ef45c7f0c3c1927f5)
Merged-In: Ia3bf53ddcc1ddefd7a236122256594ba764ee8e5
 2023-03-14 12:06:50 +00:00
Anton Hansson
a8c1cacaf9 Merge "Add filegroup_defaults module" 2023-03-14 12:04:13 +00:00
Anton Hansson
049034953d Merge "Add filegroup_test.go to sources" am: eaab87405c am: 51f92dc397 am: 9d897c130a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2470484

Change-Id: I0e1017176f6d0a3401678de06c330ec421cd1a44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 09:51:51 +00:00
Anton Hansson
9d897c130a Merge "Add filegroup_test.go to sources" am: eaab87405c am: 51f92dc397 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2470484

Change-Id: I57930f7529760d0075ab820865a8b7f79385be91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 09:15:23 +00:00
Anton Hansson
51f92dc397 Merge "Add filegroup_test.go to sources" am: eaab87405c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2470484

Change-Id: I6ea42556a0af0819f7579b3fd3de598fafa8c842
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 08:40:24 +00:00
Anton Hansson
eaab87405c Merge "Add filegroup_test.go to sources" 2023-03-14 07:58:40 +00:00
Kevin Han
6907c0b1d8 Merge "Revert "Revert "Revert "Add integration test for testing generat..."" am: a2e8ae1771 am: acfaf20c25 am: 9d5b06173b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2485538

Change-Id: I67e46111fbe4717356aaa7e5b1f32d77a3c80cb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 22:56:18 +00:00
Kevin Han
9d5b06173b Merge "Revert "Revert "Revert "Add integration test for testing generat..."" am: a2e8ae1771 am: acfaf20c25 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2485538

Change-Id: I76e724c73816611a2a30f39eb6d1df877de22e50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 22:03:01 +00:00
Kevin Han
acfaf20c25 Merge "Revert "Revert "Revert "Add integration test for testing generat..."" am: a2e8ae1771 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2485538

Change-Id: I79d24fafc48c5ae4d3d08cfb080e43daffa89388
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 21:28:45 +00:00
Kevin Han
a2e8ae1771 Merge "Revert "Revert "Revert "Add integration test for testing generat..."" 2023-03-13 21:03:23 +00:00
Kevin Han
1e75eccb18 Revert "Revert "Revert "Add integration test for testing generat..." 
Revert submission 2481062-sbom

Reason for revert: b/273332655

Reverted changes: /q/submissionid:2481062-sbom

Change-Id: I9297f585ab426d0b5586a7a77e983e8bafb19f20
 2023-03-13 20:57:32 +00:00
Matt Gilbride
bd1d4cd780 Merge "Disable new lint checks from Android Studio" am: 34127be4e9 am: d9ccbe1eb9 am: 69893d62d6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2383132

Change-Id: I8b67eb247401accc351a010e1822ed1c4fb0232d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 20:00:47 +00:00
Wei Li
afbbe49aa9 Merge "Revert "Revert "Add integration test for testing generated SBOM with .im...""" am: 601fc0137e am: 5a64d35e28 am: b0aa9cfe0c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2482056

Change-Id: I53e55a155680f3e63a2ec203daff14f19c4c4e4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 20:00:19 +00:00
Matt Gilbride
69893d62d6 Merge "Disable new lint checks from Android Studio" am: 34127be4e9 am: d9ccbe1eb9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2383132

Change-Id: Ib1b3e837652200cb3f3e7a73072ef8e2d52792f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 19:06:43 +00:00
Wei Li
b0aa9cfe0c Merge "Revert "Revert "Add integration test for testing generated SBOM with .im...""" am: 601fc0137e am: 5a64d35e28 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2482056

Change-Id: If5ec958d360060c37a57a06e41b2fa04704db02d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 19:06:00 +00:00
Matt Gilbride
d9ccbe1eb9 Merge "Disable new lint checks from Android Studio" am: 34127be4e9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2383132

Change-Id: Icc1c1475d980f88bd08481f597e6003933e5906d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 18:34:27 +00:00
Wei Li
5a64d35e28 Merge "Revert "Revert "Add integration test for testing generated SBOM with .im...""" am: 601fc0137e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2482056

Change-Id: I6dc7fe6e81bd9cda0fea504f81cf21389432bb8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 18:33:30 +00:00
Matt Gilbride
34127be4e9 Merge "Disable new lint checks from Android Studio" 2023-03-13 18:03:46 +00:00
Wei Li
601fc0137e Merge "Revert "Revert "Add integration test for testing generated SBOM with .im...""" 2023-03-13 17:43:59 +00:00
Alix Espino
5ae61b6e2b Merge "Update load statements in java.go bp2build" am: 686df31852 am: fd11e9ee5b am: ebf4fd11e1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2480297

Change-Id: I77aa18166e04c11e5197298508c0cc5bc1cc23f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 17:34:10 +00:00
Alix Espino
ebf4fd11e1 Merge "Update load statements in java.go bp2build" am: 686df31852 am: fd11e9ee5b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2480297

Change-Id: I88b15d97d5c4d84661852d2329c30256bf2b36e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 16:59:27 +00:00
Alix Espino
fd11e9ee5b Merge "Update load statements in java.go bp2build" am: 686df31852 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2480297

Change-Id: I132636c4b4d96394eb844435fb7c31212bd93fae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 16:07:00 +00:00
Anton Hansson
7d6dd8bb33 Add filegroup_defaults module 
Allows specifying shared filegroup attributes in a central place.

Test: filegroup_test.go
Change-Id: I82feac37ae6998313a0004f8af58f3decf7a514e
 2023-03-13 16:02:06 +00:00
Alix Espino
686df31852 Merge "Update load statements in java.go bp2build" 2023-03-13 15:27:15 +00:00
Alix
82acaf545f Update load statements in java.go bp2build 
load statements will all now point to rules.bzl files and won't have to
be constantly updated.

Bug: 271612705
Test: CI
Change-Id: I663b9730f1b5b333682ea301ce4d9a505626faaa
 2023-03-13 15:27:01 +00:00
Anton Hansson
7a444cec60 Add filegroup_test.go to sources 
I don't think it was running before.

Test: yes
Change-Id: Ia3bf53ddcc1ddefd7a236122256594ba764ee8e5
 2023-03-13 15:24:17 +00:00
Treehugger Robot
e65c2c848c Merge "Revert "Add protected_properties support in defaults modules"" am: cb301ccdca am: 6235f58040 am: b713af17e8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2482517

Change-Id: I54bde6ac3a4e85d8ee4a22fb1ef929ac2b9e0169
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 07:58:09 +00:00
Treehugger Robot
b713af17e8 Merge "Revert "Add protected_properties support in defaults modules"" am: cb301ccdca am: 6235f58040 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2482517

Change-Id: I1ff684895e733fcb3ef5f9aa51dd9b2b89349cb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 07:04:19 +00:00
Treehugger Robot
6235f58040 Merge "Revert "Add protected_properties support in defaults modules"" am: cb301ccdca 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2482517

Change-Id: Ib6cb459e7ace2e4d31e9c254ad2b674f98e1214a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 06:13:28 +00:00
Treehugger Robot
cb301ccdca Merge "Revert "Add protected_properties support in defaults modules"" 2023-03-13 05:34:58 +00:00
Treehugger Robot
8a2939d3d8 Merge "Use Sec as well as Usec in ProcResInfo" am: bb7c61ff61 am: e5f1a96ac6 am: 86dc015216 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2471944

Change-Id: Id8bd6bf5f1da2f3e9b4351b2c94aa47c2f431200
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-11 01:14:05 +00:00
Liz Kammer
eeeb952b27 Revert "Add protected_properties support in defaults modules" 
This reverts commit 799962789a.

Test: m nothing
Change-Id: Ia43c2ee216dc42ae5cf3e4d138aa9d0e05a9ee60
 2023-03-10 18:53:59 -05:00
Treehugger Robot
86dc015216 Merge "Use Sec as well as Usec in ProcResInfo" am: bb7c61ff61 am: e5f1a96ac6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2471944

Change-Id: I8b07473549f66b93d3e7a0d98bbc710f4b6b7480
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 23:44:48 +00:00
Treehugger Robot
e5f1a96ac6 Merge "Use Sec as well as Usec in ProcResInfo" am: bb7c61ff61 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2471944

Change-Id: I0636cde135bdf5c529e1e3b5e814e95834a423b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 22:51:07 +00:00