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

80368 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colin Cross
3ba26576b7 Fix TestAarImportProducesJniPackages/aar-no-jni am: e8eeec913f am: a5458ee6ea am: 4fbafd5bda 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2876761

Change-Id: I70c572e137e7916e9075dc7c02c848ae9f480dc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-18 20:42:51 +00:00
Colin Cross
4fbafd5bda Fix TestAarImportProducesJniPackages/aar-no-jni am: e8eeec913f am: a5458ee6ea 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2876761

Change-Id: I8fbc30d8f9f52b7a2b9b0231982313555c5a18ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-18 20:11:10 +00:00
Colin Cross
a5458ee6ea Fix TestAarImportProducesJniPackages/aar-no-jni am: e8eeec913f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2876761

Change-Id: I385316f548bc58bb67ff41051eb7ad7eb1a78f60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-18 19:32:25 +00:00
Ludovic Barman
10386bd78e [automerger skipped] Merge "Rust protobuf 2->3: Update build system" into main am: cd11c9535f am: 1e95f792a6 -s ours am: 91059c6932 -s ours 
am skip reason: Merged-In I1d07c433aca41ccfe2e710821cf930c413dc12d6 with SHA-1 28216dbe8d is already in history

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

Change-Id: I5d35391edec26d3143a00107719e8493ac1e623f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-16 08:01:45 +00:00
Ludovic Barman
91059c6932 [automerger skipped] Merge "Rust protobuf 2->3: Update build system" into main am: cd11c9535f am: 1e95f792a6 -s ours 
am skip reason: Merged-In I1d07c433aca41ccfe2e710821cf930c413dc12d6 with SHA-1 28216dbe8d is already in history

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

Change-Id: Ia728d2dbe61f80446d3383a4df22ad5443f17d12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-16 07:28:42 +00:00
Ludovic Barman
1e95f792a6 Merge "Rust protobuf 2->3: Update build system" into main am: cd11c9535f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2817733

Change-Id: Id22737ab06355a187d7defa997457e7c7af1aa4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-16 06:54:37 +00:00
Ludovic Barman
cd11c9535f Merge "Rust protobuf 2->3: Update build system" into main 2023-12-16 06:20:12 +00:00
Cole Faust
bc7755ff52 Merge "Sandbox camera-its" into main am: db0eeb5bdd am: 9582ba1e8d am: ce07800238 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2874576

Change-Id: I90d190c652993754efd3f8547d26afd94dd40757
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-15 23:25:05 +00:00
Cole Faust
ce07800238 Merge "Sandbox camera-its" into main am: db0eeb5bdd am: 9582ba1e8d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2874576

Change-Id: Ib49777ce616f02889d69cb41b0fa50a0fa8e6e0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-15 22:51:58 +00:00
Cole Faust
9582ba1e8d Merge "Sandbox camera-its" into main am: db0eeb5bdd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2874576

Change-Id: I07c6fbc970dfadac0e4f2b38a3e84dcac1d99b39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-15 22:22:05 +00:00
Cole Faust
db0eeb5bdd Merge "Sandbox camera-its" into main 2023-12-15 21:57:29 +00:00
Chris Antol
062d6235d3 Merge "Revert^5 "Enable dex container (DEX v41) for the whole system"" into main am: 6482cb97cd am: 7752fc2274 am: e5e4ec833f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2876730

Change-Id: I3ac4be658ef85c76be323cf4fa34e0874ada65c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-15 20:43:34 +00:00
Chris Antol
e5e4ec833f Merge "Revert^5 "Enable dex container (DEX v41) for the whole system"" into main am: 6482cb97cd am: 7752fc2274 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2876730

Change-Id: Icba949852c36f4cfd1fa3ab100c3218ff40f768e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-15 20:12:09 +00:00
Chris Antol
7752fc2274 Merge "Revert^5 "Enable dex container (DEX v41) for the whole system"" into main am: 6482cb97cd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2876730

Change-Id: I0f11e266d94823f217cae73f81717bcfc54a1e01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-15 19:38:28 +00:00
Chris Antol
6482cb97cd Merge "Revert^5 "Enable dex container (DEX v41) for the whole system"" into main 2023-12-15 19:01:34 +00:00
Chris Antol
a33691288e Revert^5 "Enable dex container (DEX v41) for the whole system" 
This reverts commit d45836eb38.

Reason for revert: Still breaks tests

Bug: 314212435
Change-Id: I35867878c9a8b2aa3d64092a5326c42191569adc
 2023-12-15 18:15:51 +00:00
David Srbecky
c890d53518 Merge "Revert^4 "Enable dex container (DEX v41) for the whole system"" into main am: a6bc7c87bd am: 354153aa2e am: 58ca20aa7b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2859465

Change-Id: I7c2c6c3fe4952ee9c57e70853feb4b920687cb15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-15 14:36:42 +00:00
David Srbecky
58ca20aa7b Merge "Revert^4 "Enable dex container (DEX v41) for the whole system"" into main am: a6bc7c87bd am: 354153aa2e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2859465

Change-Id: I9098be31c9a6bc5c15dd65b5d483e41e81418298
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-15 14:05:08 +00:00
David Srbecky
354153aa2e Merge "Revert^4 "Enable dex container (DEX v41) for the whole system"" into main am: a6bc7c87bd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2859465

Change-Id: I896f0dedd5bb75eac96d75d470297ff102a7ab4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-15 13:34:38 +00:00
Ludovic Barman
19739bf6a5 Rust protobuf 2->3: Update build system 
tldr: remove protobuf2 from Android Rust and upgrade everything to pb3.

These commits update:
- The grpcio rust crate to use protobuf 3
- The build system to always use the new libprotobuf (pb3) instead of the _deprecated variant (for pb2); they also force-enable libprotobuf everywhere, ignoring the use_protobuf3 flag, removes the tests related to pb2
- The following modules, which required syntax changes:
-- packages/modules/Bluetooth
-- device/google/cuttlefish
-- vendor/auto

Bug: 308790516
Test: m rust
Ignore-AOSP-First: must be done in main to upgrade cuttlefish+vendor with the rest all at once
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7d0783ce22b3d7d369786d4b16067c79c033185b)
Merged-In: I1d07c433aca41ccfe2e710821cf930c413dc12d6

Change-Id: I1d07c433aca41ccfe2e710821cf930c413dc12d6
 2023-12-15 13:23:33 +00:00
David Srbecky
a6bc7c87bd Merge "Revert^4 "Enable dex container (DEX v41) for the whole system"" into main 2023-12-15 13:05:51 +00:00
Cole Faust
53eb8bf8c7 Merge "Reapply "Handle symlinks in sbox"" into main am: b0a21dc871 am: f64f9f5be6 am: 1a772fbf5a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2876597

Change-Id: Iec1767499c024a96d2535fe289d05db5d9217f10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-15 03:32:14 +00:00
Cole Faust
1a772fbf5a Merge "Reapply "Handle symlinks in sbox"" into main am: b0a21dc871 am: f64f9f5be6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2876597

Change-Id: Idad68304b289ac5841e2b84932f3e4289c0aad9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-15 02:58:31 +00:00
Cole Faust
f64f9f5be6 Merge "Reapply "Handle symlinks in sbox"" into main am: b0a21dc871 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2876597

Change-Id: I83d57fccedf5ad0b7249ec945a069b4d9b406333
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-15 02:27:53 +00:00
Cole Faust
b0a21dc871 Merge "Reapply "Handle symlinks in sbox"" into main 2023-12-15 02:00:40 +00:00
Colin Cross
e8eeec913f Fix TestAarImportProducesJniPackages/aar-no-jni 
TestAarImportProducesJniPackages was attempting to assert that an
aar_import module always had a JniPackageProvider, but was instead
asserting that the return type was always a JniPackageInfo.  Since
ModuleProvider returned the zero value of JniPackageInfo even when
there was no provider that was always true.

Fix aar_import to always set JniPackageProvider.

Test: TestAarImportProducesJniPackages
Change-Id: Idaf106e14373490d4eb807892e174aaaf094bbcf
 2023-12-14 16:12:20 -08:00
Cole Faust
ca355af1fc Reapply "Handle symlinks in sbox" 
This reverts commit 6a855191bd.

Reason for revert: Last issue fixed with aosp/2875001

Change-Id: I961ea6d97c936df8a6475995b768a7eda861e6ee
 2023-12-14 23:38:38 +00:00
Cole Faust
d51f396eb1 Merge "Add sdk_genrule" into main am: 0d6bb34801 am: 0d3d2fd617 am: 86aa4a45be 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2871228

Change-Id: I4b515f7e787035d827abace084b8cde93fede32d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-14 23:23:30 +00:00
Cole Faust
9dd4fad091 Merge "Allow compile_data on all java modules" into main am: c01104234e am: 1a09b13d93 am: b6b09c2d53 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2875178

Change-Id: I5d2b973e5ee67bbb01558475550e116851ab7963
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-14 23:22:27 +00:00
Cole Faust
86aa4a45be Merge "Add sdk_genrule" into main am: 0d6bb34801 am: 0d3d2fd617 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2871228

Change-Id: Id714b2293f6ae31e05058199059a32480a67a536
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-14 22:51:55 +00:00
Cole Faust
b6b09c2d53 Merge "Allow compile_data on all java modules" into main am: c01104234e am: 1a09b13d93 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2875178

Change-Id: I7ad268e9a75c0d01e6bc1b1ac8de4be9dccdadd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-14 22:50:22 +00:00
Cole Faust
0d3d2fd617 Merge "Add sdk_genrule" into main am: 0d6bb34801 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2871228

Change-Id: I159924525ba338799500cdac03fc9c612875b493
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-14 22:20:38 +00:00
Cole Faust
1a09b13d93 Merge "Allow compile_data on all java modules" into main am: c01104234e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2875178

Change-Id: I43abbf6833fade5aa91906a11c79a94d1bd38b50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-14 22:19:16 +00:00
Cole Faust
0d6bb34801 Merge "Add sdk_genrule" into main 2023-12-14 21:58:10 +00:00
Cole Faust
c01104234e Merge "Allow compile_data on all java modules" into main 2023-12-14 21:44:46 +00:00
Yu Liu
3b4032600f Merge "Properly package aconfig files for vendor partition" into main am: a1df1a5937 am: 10d22de5d3 am: 59d425941b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2875174

Change-Id: I285a847312ed43f40a10dbee1d5c9a4189fdcae8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-14 20:56:26 +00:00
Yu Liu
59d425941b Merge "Properly package aconfig files for vendor partition" into main am: a1df1a5937 am: 10d22de5d3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2875174

Change-Id: I0f8d8e3e585cc3b3e5b64ddff16c880b75f62e2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-14 20:24:04 +00:00
Yu Liu
10d22de5d3 Merge "Properly package aconfig files for vendor partition" into main am: a1df1a5937 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2875174

Change-Id: Ia9619b2acb34c6d2f3746619bfcc86aebe7645e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-14 19:52:37 +00:00
Yu Liu
a1df1a5937 Merge "Properly package aconfig files for vendor partition" into main 2023-12-14 19:14:11 +00:00
Treehugger Robot
ce6f14cafe Merge "Revert "Handle symlinks in sbox"" into main am: a53330a525 am: 35c138a662 am: 251f9229f5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2874577

Change-Id: I60fc635f5ce95156ce9fae9cc02cd3c039585983
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-14 03:31:07 +00:00
Treehugger Robot
251f9229f5 Merge "Revert "Handle symlinks in sbox"" into main am: a53330a525 am: 35c138a662 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2874577

Change-Id: I3184833ae4ea082b07e664164d2fe031cfe3f701
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-14 02:58:27 +00:00
Treehugger Robot
35c138a662 Merge "Revert "Handle symlinks in sbox"" into main am: a53330a525 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2874577

Change-Id: I307dff0c64123fd005b2663bf4c09f0a7440c88b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-14 02:27:47 +00:00
Treehugger Robot
6421be6f3c Merge "Enable Soong's tradefed_binary to support multi-arch" into main am: 453afad7b5 am: 36a499100d am: 02064ab57c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2849275

Change-Id: I6e2a73320f2571334d7aef8e8c6a02f9df272de2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-14 02:25:29 +00:00
Cole Faust
2b64af861a Allow compile_data on all java modules 
art java_test modules need to specify compile_data, make it common
to all java modules.

Bug: 307824623
Test: m lint-check
Change-Id: I68640f14137f9cadaf0c454d3b5abc9e2d1d9b4b
 2023-12-13 18:22:18 -08:00
Treehugger Robot
a53330a525 Merge "Revert "Handle symlinks in sbox"" into main 2023-12-14 01:58:17 +00:00
Treehugger Robot
02064ab57c Merge "Enable Soong's tradefed_binary to support multi-arch" into main am: 453afad7b5 am: 36a499100d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2849275

Change-Id: I22a3901813e89f14dcb0a210dc5ed2ee013a59c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-14 01:52:39 +00:00
Treehugger Robot
36a499100d Merge "Enable Soong's tradefed_binary to support multi-arch" into main am: 453afad7b5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2849275

Change-Id: I8e4fb6db12940f7653831b228eb1d3e2b766a85f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-14 01:22:10 +00:00
Yu Liu
6dc93f9a09 Properly package aconfig files for vendor partition 
Bug: 311173471
Test: Unit tests
Change-Id: Ibb857b69c3f83326a9ff5732e11dd09887e4ba6e
 2023-12-14 01:19:35 +00:00
Treehugger Robot
453afad7b5 Merge "Enable Soong's tradefed_binary to support multi-arch" into main 2023-12-14 00:55:37 +00:00
Treehugger Robot
06d687d40f Merge "Avoid -target riscv64-linux-androidVanillaIceCream." into main am: 3e22fe2193 am: 2553359fcb am: fe315bd5aa 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2871232

Change-Id: Ie72f92befe3599251fb27b66fca14bff14a905c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-14 00:30:55 +00:00