tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
74104 commits 1 branch 0 tags 115 MiB
Commit graph

74104 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anton Hansson
3efbb3649e Merge "Make the srcjar for bcp available in OutputFiles" into main am: 0843b79d8c am: 4e34213372 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760367

Change-Id: Ifdcedf2168b38559e2c5973bbacb5ad3ae38dd3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 18:28:58 +00:00
Anton Hansson
f7931b390a Merge "Add srcjar output for platform_bootclasspath" into main am: c38757d0c0 am: 10d91d7107 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757569

Change-Id: I6ebb3f0be38af38f2f862593a3f185579d231d7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 18:28:50 +00:00
Anton Hansson
4a1fdf1964 Merge "Collect transitive source files for java modules" into main am: 9231132099 am: ea95719555 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757568

Change-Id: Idad894c8cf621d172f8dc6f9504064de379d0bec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 18:28:40 +00:00
Cole Faust
44c777c05d Merge "AVB and selinux support in partitions" into main am: 6ed1e0fd59 am: 32670ab73d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2766206

Change-Id: I00d2326fde6b9ac9461db19b5586044f3b126585
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 18:28:22 +00:00
Zi Wang
965367f3e0 Merge "Always drop deps from android_library with no srcs" into main am: 2201343fce am: 50225c86b6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2765453

Change-Id: I1e4500e867959ceae0e96498fa6270772513befa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 18:27:58 +00:00
Ivan Lozano
6f4c75963d Merge "rust: Import protos from dependent rust_protobuf" into main am: a0d741edef am: a9ee22614d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757786

Change-Id: Ia02492c9d1fe713500a0c211b9846b5ebb4800e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 18:27:27 +00:00
Christopher Parsons
87a33f30b2 Merge "Update bp2build tests to use stubbed defs" into main am: e3f7a0d4d6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2766386

Change-Id: I7116d9ebbb741a1bdff0e7751039cca1bc71da1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 17:25:58 +00:00
Anton Hansson
4e34213372 Merge "Make the srcjar for bcp available in OutputFiles" into main am: 0843b79d8c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760367

Change-Id: Ie50e0e8b4617ce3ae8e8664c59d86be795a97d7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 17:25:03 +00:00
Anton Hansson
10d91d7107 Merge "Add srcjar output for platform_bootclasspath" into main am: c38757d0c0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757569

Change-Id: Iccbf6e1571e4ed4321e9c4367590e8faac1c2acd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 17:24:25 +00:00
Anton Hansson
ea95719555 Merge "Collect transitive source files for java modules" into main am: 9231132099 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757568

Change-Id: Ie286b14529f4ff4aec1845d930b802d160be27f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 17:24:03 +00:00
Christopher Parsons
e3f7a0d4d6 Merge "Update bp2build tests to use stubbed defs" into main 2023-09-28 17:23:50 +00:00
Cole Faust
32670ab73d Merge "AVB and selinux support in partitions" into main am: 6ed1e0fd59 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2766206

Change-Id: I8d89ca7a67dfd129bcd73b8758bb76703fc13283
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 17:23:44 +00:00
Zi Wang
50225c86b6 Merge "Always drop deps from android_library with no srcs" into main am: 2201343fce 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2765453

Change-Id: I1f96c94d6d6a3cde283a551f9cc7b4ad0ca5369e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 17:23:28 +00:00
Ivan Lozano
a9ee22614d Merge "rust: Import protos from dependent rust_protobuf" into main am: a0d741edef 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757786

Change-Id: I236f5de0b64cab70dece6520e685a78cf2257585
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 17:21:02 +00:00
Anton Hansson
0843b79d8c Merge "Make the srcjar for bcp available in OutputFiles" into main 2023-09-28 17:09:50 +00:00
Anton Hansson
c38757d0c0 Merge "Add srcjar output for platform_bootclasspath" into main 2023-09-28 16:56:55 +00:00
Anton Hansson
9231132099 Merge "Collect transitive source files for java modules" into main 2023-09-28 16:46:30 +00:00
Cole Faust
6ed1e0fd59 Merge "AVB and selinux support in partitions" into main 2023-09-28 16:38:28 +00:00
Zi Wang
2201343fce Merge "Always drop deps from android_library with no srcs" into main 2023-09-28 16:16:51 +00:00
usta
c45478190f Skip @bazel_tools// labels from ninja 
Since these bazel labels are removed from depsets anyways,
there is little reason to convert they to ninja build statements

Test: m nothing (with bazel af426041)
Bug: 301638491
Change-Id: Ie920477231d147d0b5b7dbcd1c59ed9985a80abb
 2023-09-28 16:03:15 +00:00
Ivan Lozano
a0d741edef Merge "rust: Import protos from dependent rust_protobuf" into main 2023-09-28 15:58:48 +00:00
Anton Hansson
b3738ed1f4 Make the srcjar for bcp available in OutputFiles 
This makes it possible for Android.bp files to depends on the srcjar.

Bug: 151360309
Test: m platform-bootclasspath.srcjar
Change-Id: Id42cc3cff89c084b55c7fb0726ad84ecd4f50f58
 2023-09-28 13:22:39 +00:00
Anton Hansson
57162c515e Add srcjar output for platform_bootclasspath 
This output contains all the transitive sources that are contained in
the bootclasspath.

It's currently limited to source-built bootclasspath components. Future
work will make this deal with sdk_library prebuilts.

Bug: 151360309
Test: unit test, as well as manual inspection of platform-bootclasspath
Change-Id: Ie05d8125e19736d8b4b9ebafb70b88a0a40069d5
 2023-09-28 13:21:21 +00:00
Anton Hansson
0e73f9ee6d Collect transitive source files for java modules 
This new entry in the JavaInfoProvider lists all the transitive source
files contained within the library. That is, the source files of the
module and all its static dependencies.

Bug: 151360309
Test: unit test in java_go + some manual testing
Change-Id: I7fe3035b9e46774095c0e9196cd77fa1027adf6d
 2023-09-28 13:20:49 +00:00
Sam Delmerico
cc33472cf5 Merge "Revert^2 "rustSetToolchainSource to use linux-x86 srcs"" into main am: 0dfd62a391 am: 5e02a1e1b7 am: 1911204a5b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2761811

Change-Id: Ic517a7c131d50b42df58c7105df4bd657ed301e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 13:16:06 +00:00
Sam Delmerico
1911204a5b Merge "Revert^2 "rustSetToolchainSource to use linux-x86 srcs"" into main am: 0dfd62a391 am: 5e02a1e1b7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2761811

Change-Id: Id8c5a23c40299fc7775e6c68c8a4f2f258a20598
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 12:15:28 +00:00
Sam Delmerico
5e02a1e1b7 Merge "Revert^2 "rustSetToolchainSource to use linux-x86 srcs"" into main am: 0dfd62a391 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2761811

Change-Id: Ic7a8980c8aeb8221b62c672c38cf6d45ce39b8e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 11:09:12 +00:00
Jingwen Chen
29686a6922 Merge "Allowlist directories for tradefed's deps." into main am: 6b73be150c am: be81da7e7e am: bb3ab13a34 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2763425

Change-Id: Ibcd9362733c7fc7df91be523d2f0563293a7d9ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 10:13:11 +00:00
Sam Delmerico
0dfd62a391 Merge "Revert^2 "rustSetToolchainSource to use linux-x86 srcs"" into main 2023-09-28 09:53:29 +00:00
Jingwen Chen
bb3ab13a34 Merge "Allowlist directories for tradefed's deps." into main am: 6b73be150c am: be81da7e7e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2763425

Change-Id: Idd827dad4fcea78499a24a0414f8b8506ae143b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 09:12:03 +00:00
Jingwen Chen
be81da7e7e Merge "Allowlist directories for tradefed's deps." into main am: 6b73be150c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2763425

Change-Id: Ibaea54cfece3200a546989ed869f5a018e2d74ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 08:04:41 +00:00
Jingwen Chen
6b73be150c Merge "Allowlist directories for tradefed's deps." into main 2023-09-28 06:51:29 +00:00
Maxim Siniavine
8f08662dee Merge changes from topic "revert-2755310-HIIDCMFNIU" into main am: 4aa82a13db am: 12663c872e am: dbfe6b66dc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2766348

Change-Id: I0ebe53baaeda38335204c210076d35c568f3cd2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 04:03:35 +00:00
Maxim Siniavine
b1b05aea50 Revert "Add flagged api hide conditional to droidstubs" am: 1180919dda am: 57639c5e65 am: 4a564b5bcd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2766347

Change-Id: Iabb5fb4fb2bce60bdd6b3f8c714720217eee56be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 04:03:32 +00:00
Treehugger Robot
71ffddffaa Merge "Make platform_mappings file deterministic" into main am: f51ed265e4 am: b942e672f9 am: e8e3c1d471 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2766205

Change-Id: I87ee41f1978c7289ebeb362a68581c869a91f421
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 04:02:28 +00:00
Maxim Siniavine
dbfe6b66dc Merge changes from topic "revert-2755310-HIIDCMFNIU" into main am: 4aa82a13db am: 12663c872e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2766348

Change-Id: I8bc1ded7708c597edfa46bd234027bf14f1488c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 03:02:13 +00:00
Maxim Siniavine
4a564b5bcd Revert "Add flagged api hide conditional to droidstubs" am: 1180919dda am: 57639c5e65 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2766347

Change-Id: Iba5f7b34be3865e9ac5a72c05a8113e2c0eff55d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 03:02:11 +00:00
Treehugger Robot
e8e3c1d471 Merge "Make platform_mappings file deterministic" into main am: f51ed265e4 am: b942e672f9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2766205

Change-Id: I376a5244946bfb24a011e0edbaa96f0215eb1b86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 03:01:56 +00:00
Maxim Siniavine
12663c872e Merge changes from topic "revert-2755310-HIIDCMFNIU" into main am: 4aa82a13db 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2766348

Change-Id: I51b0213f78192a3a6d8fc92a3e995e2fb16a606f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 01:55:28 +00:00
Maxim Siniavine
57639c5e65 Revert "Add flagged api hide conditional to droidstubs" am: 1180919dda 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2766347

Change-Id: Iecdfb508043d33ed23479d4fe758980943b629d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 01:55:22 +00:00
Treehugger Robot
b942e672f9 Merge "Make platform_mappings file deterministic" into main am: f51ed265e4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2766205

Change-Id: I314177684139793026d3bbbc375f6d9427dad054
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 01:54:52 +00:00
Maxim Siniavine
4aa82a13db Merge changes from topic "revert-2755310-HIIDCMFNIU" into main 
* changes:
  Revert "Add soong config variable Release_expose_flagged_api"
  Revert "Add flagged api hide conditional to droidstubs"
 2023-09-28 01:08:44 +00:00
Maxim Siniavine
1180919dda Revert "Add flagged api hide conditional to droidstubs" 
Revert submission 2755310

Reason for revert: Broken build b/302407753

Reverted changes: /q/submissionid:2755310

Change-Id: I56306fc3b7e5608d21dbefe18d6a886561599f40
 2023-09-28 01:01:59 +00:00
Maxim Siniavine
5548bf3053 Revert "Add soong config variable Release_expose_flagged_api" 
Revert submission 2755310

Reason for revert: Broken build b/302407753

Reverted changes: /q/submissionid:2755310

Change-Id: Ib5c01033882500296989a7c4476a723d95292aab
 2023-09-28 01:01:59 +00:00
Ivan Lozano
d106efe76d rust: Import protos from dependent rust_protobuf 
rust_protobuf were unable to import protos from other rust_protobuf
modules. This CL adds support for that. rust_protobuf modules which are
listed in rustlibs will have their modules imported into the generated
protobuf stub. Additionally, rust_protobuf modules which define
"exported_include_dirs" will export those include paths to dependent
rust_protobuf modules.

Bug: 301266700
Test: m rust
Change-Id: I132edffa4d77e0ac80a7ac934f873374c8e94c1b
 2023-09-27 20:53:54 -04:00
Treehugger Robot
f51ed265e4 Merge "Make platform_mappings file deterministic" into main 2023-09-28 00:37:51 +00:00
Romain Jobredeaux
ae9096771c Merge changes from topic "bazel_framework_res" into main am: 641b62b205 am: b0e61183f3 am: f1a3d7a303 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2720593

Change-Id: I36807ba567c5d092bff4678c8b443f5a799d2eaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-27 23:54:48 +00:00
Chris Parsons
8a532b78e5 Update bp2build tests to use stubbed defs 
bp2build tests should not use bp2build_available:false test deps,
because, with the "allowlist v2" feature, this will cause these modules
to stop being converted with bp2build. Instead, such test deps should be
"stubbed", which effectively treats them like targets in pre-existing
BUILD files on the filesystem.

Bug: 301312260
Test: m nothing
Change-Id: Ib1ce7c87cd1e98568fdaf2a52a893dafa74ab327
 2023-09-27 23:11:26 +00:00
Romain Jobredeaux
f1a3d7a303 Merge changes from topic "bazel_framework_res" into main am: 641b62b205 am: b0e61183f3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2720593

Change-Id: I982a8d244d21dba4d09d2e568f03fecf1ac1d508
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-27 22:53:48 +00:00
Romain Jobredeaux
b0e61183f3 Merge changes from topic "bazel_framework_res" into main am: 641b62b205 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2720593

Change-Id: Ifb2c83f9d7390a2f40083ab4e3f8625bbe5f45af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-27 21:47:27 +00:00