StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80,289 Commits 1 Branch 0 Tags
b22fb3598107e8ec8851f901b03404f24e812d3a
Commit Graph

80289 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wei Li
b22fb35981 Merge "Build native libraries used by layoutlib." into main am: c1fb159206 am: 1529f7f8de am: 26d380bf22 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2868429

Change-Id: I39c8c98c0ac4612ce1acdc9629ae7e5866d8e80c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-12 18:08:40 +00:00
Wei Li
26d380bf22 Merge "Build native libraries used by layoutlib." into main am: c1fb159206 am: 1529f7f8de 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2868429

Change-Id: Ied1ae7c17b9dc9274124dce25c783780bf325d2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-12 17:36:39 +00:00
Wei Li
1529f7f8de Merge "Build native libraries used by layoutlib." into main am: c1fb159206 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2868429

Change-Id: Ic68edaa35ee26a0e1b9556d0adeab4dc6f80d929
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-12 17:05:17 +00:00
Wei Li
c1fb159206 Merge "Build native libraries used by layoutlib." into main 2023-12-12 16:18:16 +00:00
Mårten Kongstad
284ec6a2d7 Merge "Add exported_java_aconfig_library" into main am: 18c95ecab9 am: 85be90aacb am: 1337f67835 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2838358

Change-Id: Ibd7e973419ba8dad61de3a9b32edb1327b880d60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-12 11:22:24 +00:00
Mårten Kongstad
1337f67835 Merge "Add exported_java_aconfig_library" into main am: 18c95ecab9 am: 85be90aacb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2838358

Change-Id: I898e7f5bafdb9114d90f8a1061d1804efcf060dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-12 10:51:17 +00:00
Mårten Kongstad
85be90aacb Merge "Add exported_java_aconfig_library" into main am: 18c95ecab9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2838358

Change-Id: Ia2631f5335981e881d9da56c55e7eb848c8311a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-12 10:19:51 +00:00
Mårten Kongstad
18c95ecab9 Merge "Add exported_java_aconfig_library" into main 2023-12-12 09:46:05 +00:00
Treehugger Robot
2e437020c2 Merge "Remove extra go.mod files" into main am: 4e8a7e9974 am: 8ee58284c5 am: 0064ec064b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2870014

Change-Id: I0a6e143d756355f41459b65a0ce442041e77cc83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-12 05:09:40 +00:00
Yu Liu
52a7f5958b Support rust modules when packaging aconfig files in apex. am: cec0e410cd am: c6d3db4dd4 am: 00ca30ce0e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2855425

Change-Id: Icb0e84013f8c5864e9f41386480e393816639076
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-12 05:09:18 +00:00
Wei Li
5f5d271fc3 Build native libraries used by layoutlib. 
Bug: 303904212
Test: m layoutlib dist; CIs
Change-Id: Id77cba97b2f66997431beb78ecc9d9b74b64b803
 2023-12-12 05:06:20 +00:00
Treehugger Robot
0064ec064b Merge "Remove extra go.mod files" into main am: 4e8a7e9974 am: 8ee58284c5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2870014

Change-Id: I45b7c5fdc95815974b366cf0493cf4ab49ae4f00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-12 04:36:56 +00:00
Yu Liu
00ca30ce0e Support rust modules when packaging aconfig files in apex. am: cec0e410cd am: c6d3db4dd4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2855425

Change-Id: I2d3b8bf0b5bb19b444399a08ae5d8a02b6e54607
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-12 04:36:24 +00:00
Treehugger Robot
8ee58284c5 Merge "Remove extra go.mod files" into main am: 4e8a7e9974 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2870014

Change-Id: I082d16f3b561647f71875e08cfdeca28951e8850
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-12 04:06:31 +00:00
Yu Liu
c6d3db4dd4 Support rust modules when packaging aconfig files in apex. am: cec0e410cd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2855425

Change-Id: I6880b1903b8b72a94e099c5205c2222e6fcf9f56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-12 04:05:47 +00:00
Treehugger Robot
4e8a7e9974 Merge "Remove extra go.mod files" into main 2023-12-12 04:00:32 +00:00
Colin Cross
e8da10aae0 Remove extra go.mod files 
Only the top level build/soong/go.mod file should exist, any extras
breaks `go test ./...` in build/soong, and also breaks the kythe build
that produces xrefs for code search.

Bug: 315537199
Test: go test ./...
Change-Id: Id5262550654ff1559cfb3fa1ecdae95c126109df
 2023-12-12 03:02:33 +00:00
Yu Liu
cec0e410cd Support rust modules when packaging aconfig files in apex. 
Also remove the code to package aconfig files for transitive
dependencies since those files should have already been included in the
direct dependencies.

Bug: 311173471
Test: Unit tests
Change-Id: I25637af9381f71a78b70a8de9894618188c9735d
 2023-12-11 17:43:07 -08:00
Colin Cross
5c298e2c36 Merge "Remove ConvertWithBp2build implementations" into main am: a72573a727 am: cd4b2f21cd am: 8bb537ba9c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2864663

Change-Id: I86ea781dcc4761078a49ee825c47d11fde9d91be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-12 00:29:45 +00:00
Colin Cross
8bb537ba9c Merge "Remove ConvertWithBp2build implementations" into main am: a72573a727 am: cd4b2f21cd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2864663

Change-Id: Ibf46aa73b12479533288cf545d5679cdeee29ae2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-12 00:12:54 +00:00
Treehugger Robot
22620b7331 Merge "Add compile_data for android apps" into main am: b49f038231 am: c1e6e93adf am: 316e403735 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2866314

Change-Id: Id9f9a4ad9fc150c7dfd2e48062e1e4211239f284
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-12 00:01:26 +00:00
Colin Cross
cd4b2f21cd Merge "Remove ConvertWithBp2build implementations" into main am: a72573a727 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2864663

Change-Id: I55f4a62f7217a5cd13f872feeb5b91015a64175a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 23:43:44 +00:00
Tor Norbye
db119527fd Merge "303434307: Enable flagged API checking" into main am: 2624653aa9 am: 142049d248 am: 6cd2ac1d2d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2864659

Change-Id: Id0fae5a7af67a7bba7ccd3344c71d2726e941593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 23:41:00 +00:00
Jeongik Cha
4c6ede5786 Fix typo in log in ninja.go am: d74c914e36 am: bffcb9f449 am: 4197aa826c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2868454

Change-Id: I2db744b8a3f8e987b19080346fe1e1888919d100
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 23:34:43 +00:00
Treehugger Robot
b7412fd041 Merge "Remove art/test from genrule allowlist" into main am: 5eca978092 am: cfdbca0eb2 am: 1203290657 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2860707

Change-Id: I369cb00f2229f0c1a1982f7ef7d80a1bdd56ddc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 23:32:38 +00:00
Treehugger Robot
d877e83ee7 Merge "individually escape results of $(locations)" into main am: 96b6a499d9 am: 16236fe350 am: 6f7f5cae93 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2863753

Change-Id: Ia5dd9f8ad441e785d91672c0fe17972f25e17637
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 23:30:21 +00:00
Colin Cross
a72573a727 Merge "Remove ConvertWithBp2build implementations" into main 2023-12-11 23:12:53 +00:00
Xin Li
4c54cacbf3 [automerger skipped] Merge "Merge Android 14 QPR1" into main am: 1804e19358 -s ours am: 2027fd55ba -s ours am: 055a3bdc9f -s ours 
am skip reason: Merged-In Ide278450fa058b6dc565bff395f541dc7b574905 with SHA-1 f73da3ef78 is already in history

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

Change-Id: I65f542820ee8ee703bbe5b8aca400d559ece21c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 23:00:29 +00:00
Xin Li
da10198daa [automerger skipped] Merge Android 14 QPR1 am: 41968c6c20 -s ours am: 5338078b15 -s ours am: 14088676e0 -s ours 
am skip reason: Merged-In Ide278450fa058b6dc565bff395f541dc7b574905 with SHA-1 f73da3ef78 is already in history

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

Change-Id: I2ceed227567ac8554870cdee1f5446c1b8879440
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 22:57:32 +00:00
Treehugger Robot
316e403735 Merge "Add compile_data for android apps" into main am: b49f038231 am: c1e6e93adf 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2866314

Change-Id: I39f0fa3be4210c2072093518d910ed481732d632
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 22:49:41 +00:00
Tor Norbye
6cd2ac1d2d Merge "303434307: Enable flagged API checking" into main am: 2624653aa9 am: 142049d248 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2864659

Change-Id: I3d31e01cc773b039e1e6ba4175ca780cc13ae77f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 22:44:56 +00:00
Jeongik Cha
4197aa826c Fix typo in log in ninja.go am: d74c914e36 am: bffcb9f449 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2868454

Change-Id: Ia65ebfcd3d6634044f914bf19dbe68a96241d9a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 22:44:43 +00:00
Treehugger Robot
1203290657 Merge "Remove art/test from genrule allowlist" into main am: 5eca978092 am: cfdbca0eb2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2860707

Change-Id: I3ac92dc466dd62625f4ba00da0950be5fd6941b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 22:42:20 +00:00
Treehugger Robot
6f7f5cae93 Merge "individually escape results of $(locations)" into main am: 96b6a499d9 am: 16236fe350 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2863753

Change-Id: Iad9ebdbd8f351ba205dd8d4cacc8133c24607aa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 22:42:08 +00:00
Xin Li
055a3bdc9f [automerger skipped] Merge "Merge Android 14 QPR1" into main am: 1804e19358 -s ours am: 2027fd55ba -s ours 
am skip reason: Merged-In Ide278450fa058b6dc565bff395f541dc7b574905 with SHA-1 f73da3ef78 is already in history

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

Change-Id: Ie01d71606e0e3bf598a62e2575195d1eea2a25e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 22:05:20 +00:00
Xin Li
14088676e0 [automerger skipped] Merge Android 14 QPR1 am: 41968c6c20 -s ours am: 5338078b15 -s ours 
am skip reason: Merged-In Ide278450fa058b6dc565bff395f541dc7b574905 with SHA-1 f73da3ef78 is already in history

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

Change-Id: I2f100334950427fb2a9a4753acfab934ddac39e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 22:02:20 +00:00
Treehugger Robot
c1e6e93adf Merge "Add compile_data for android apps" into main am: b49f038231 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2866314

Change-Id: Ia3cf3e6a9d5ed49502d2d16489f51851e34f0a2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 21:47:54 +00:00
Tor Norbye
142049d248 Merge "303434307: Enable flagged API checking" into main am: 2624653aa9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2864659

Change-Id: Ia8d79a23429c3e15c4e3fb43942de53061a24a05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 21:46:53 +00:00
Jeongik Cha
bffcb9f449 Fix typo in log in ninja.go am: d74c914e36 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2868454

Change-Id: I5158c0bda9a8826659c2bea21be435775626c25e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 21:44:41 +00:00
Treehugger Robot
cfdbca0eb2 Merge "Remove art/test from genrule allowlist" into main am: 5eca978092 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2860707

Change-Id: I6d6b573d56513745048daf82ae95bff471d840e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 21:39:21 +00:00
Treehugger Robot
16236fe350 Merge "individually escape results of $(locations)" into main am: 96b6a499d9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2863753

Change-Id: Ie4bbb87fa72cbab8bb996ca1bf1d8ae54df066f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 21:34:47 +00:00
Xin Li
2027fd55ba [automerger skipped] Merge "Merge Android 14 QPR1" into main am: 1804e19358 -s ours 
am skip reason: Merged-In Ide278450fa058b6dc565bff395f541dc7b574905 with SHA-1 f73da3ef78 is already in history

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

Change-Id: I607ed9583970b33f1c508dc26d5644a76213f5da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 21:19:34 +00:00
Xin Li
5338078b15 [automerger skipped] Merge Android 14 QPR1 am: 41968c6c20 -s ours 
am skip reason: Merged-In Ide278450fa058b6dc565bff395f541dc7b574905 with SHA-1 f73da3ef78 is already in history

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

Change-Id: I4cafafdd6ea7099c778a0e23d143cb74778cd56d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 21:16:31 +00:00
Treehugger Robot
b49f038231 Merge "Add compile_data for android apps" into main 2023-12-11 19:25:20 +00:00
Tor Norbye
2624653aa9 Merge "303434307: Enable flagged API checking" into main 2023-12-11 18:14:56 +00:00
Jeongik Cha
d74c914e36 Fix typo in log in ninja.go 
Test: n/a
Bug: 292304818

Change-Id: I6dcb6bb3e84e15292cbd3acc613c744e3ec039f8
 2023-12-11 11:41:16 +00:00
Mårten Kongstad
c82f118d23 Add exported_java_aconfig_library 
Add a rule to generate a JAR file containing code for all aconfig flags
in all packages. This is intended for apps compiled outside the
platform.

Also add a rule to include the new JAR file among the SDK artifacts.

Note: a future CL will refine the aconfig command line options used, or
filter the aconfig output: right now the JAR really contains *all*
flags; we want it to include only *exported* flags.

Bug: 311151343
Test: m sdk dist # manually verify that this generates $(gettop)/out/dist/android-flags.jar
Change-Id: I73481a9f723a0e5487cfcd2ee697873ecc4e8275
 2023-12-11 09:51:42 +01:00
Treehugger Robot
5eca978092 Merge "Remove art/test from genrule allowlist" into main 2023-12-09 01:10:55 +00:00
Treehugger Robot
96b6a499d9 Merge "individually escape results of $(locations)" into main 2023-12-09 01:10:51 +00:00
Xin Li
1804e19358 Merge "Merge Android 14 QPR1" into main 2023-12-09 00:11:54 +00:00