Commit Graph

82350 Commits

Author SHA1 Message Date
Treehugger Robot
b1d555a77f Merge "Strip relative paths from java_import output files" into main am: 80214e550e am: 5b50be5aa9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3038158

Change-Id: I041eef99f5a14b0836a4f9d12dc6ee75d7d8d390
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-12 01:54:44 +00:00
Treehugger Robot
5b50be5aa9 Merge "Strip relative paths from java_import output files" into main am: 80214e550e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3038158

Change-Id: Id15bdd2dddfc817fa8290d7afbb3de034229d142
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-12 01:41:21 +00:00
Treehugger Robot
80214e550e Merge "Strip relative paths from java_import output files" into main 2024-04-12 01:22:10 +00:00
Colin Cross
5e87f349b8 Strip relative paths from java_import output files
androidx.annotation_annotation is used as a test data file, and
converting it from a java_library to a java_library_import causes
the relative path used in the test data path to change. Clear the
relative path in java_import the same way that other java based
modules do.

Bug: 288358614
Test: TestJavaLibraryOutputFileRel
Change-Id: I1f494110da32e916043ca94ac6ebeeafccc06f9a
2024-04-11 16:51:21 -07:00
Treehugger Robot
b71375ac31 Merge "Make app.go not executable" into main am: 0565fdc3cb am: 3ebc99c605
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3039820

Change-Id: I07d6bb4bcc0c2a9f72b74ff34bfb8060e4c0a1a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 23:04:55 +00:00
Treehugger Robot
3ebc99c605 Merge "Make app.go not executable" into main am: 0565fdc3cb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3039820

Change-Id: I561ff14b992302cc43355c07ba1309e589812c80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 22:47:42 +00:00
Treehugger Robot
0565fdc3cb Merge "Make app.go not executable" into main 2024-04-11 22:26:09 +00:00
Treehugger Robot
60d2dec9fc Merge "java_sdk_library: Use WriteFileRule for writing permissions.xml" into main am: 1065ed8fbd am: 5b5557773c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3036694

Change-Id: Ia586005e57a8556a200492273814cc07ad958264
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 21:35:39 +00:00
Treehugger Robot
de40384070 Merge "Remove unused writeFile var" into main am: 7965e1c9a8 am: cf11f90af1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3036695

Change-Id: I5a9f7f9d868b3ecdb79b04b13dba73a640889fbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 21:35:02 +00:00
Cole Faust
7a51454f5b Make app.go not executable
Test: Presubmits
Change-Id: I983e58980cab2aa58797714c216851a1a7eb7f73
2024-04-11 14:13:20 -07:00
Treehugger Robot
5b5557773c Merge "java_sdk_library: Use WriteFileRule for writing permissions.xml" into main am: 1065ed8fbd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3036694

Change-Id: I405ecf29c00c4a6225c6160bc5189bac1543eadb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 21:11:58 +00:00
Treehugger Robot
cf11f90af1 Merge "Remove unused writeFile var" into main am: 7965e1c9a8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3036695

Change-Id: I18cd8f34ab5b7c5dcdfad21f3cd71a21fcc28e4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 21:11:27 +00:00
Treehugger Robot
1065ed8fbd Merge "java_sdk_library: Use WriteFileRule for writing permissions.xml" into main 2024-04-11 20:55:30 +00:00
Treehugger Robot
7965e1c9a8 Merge "Remove unused writeFile var" into main 2024-04-11 20:54:49 +00:00
Jihoon Kang
f4b835ccd9 Merge "Collect aconfig_declarations of the dependent java_aconfig_library modules" into main am: 033ffb9533 am: 1628b82c6f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3001319

Change-Id: I81e9d102c17bb5a1caf4400fc9d9513eb2be5c02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 18:03:02 +00:00
Charlie Boutier
0a0cfc0c71 Merge "Revert "Make embedded_launcher true by default"" into main am: 291a4912d1 am: 075632712f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3039633

Change-Id: I6db333379773765ebaadb7752a04b9488a6a1450
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 18:02:46 +00:00
Spandan Das
5bcf17db15 Merge "Revert "Add the implicit deps of javacRE"" into main am: d5b05655bb am: 0c5dee6f99
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3037722

Change-Id: Ifb4ee9667fd162cd4fbf2ab905b47026ccac2e88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 18:02:12 +00:00
Jihoon Kang
1628b82c6f Merge "Collect aconfig_declarations of the dependent java_aconfig_library modules" into main am: 033ffb9533
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3001319

Change-Id: I1deece1774b3d67272cce32d64cea6a0d93de1ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 17:38:50 +00:00
Charlie Boutier
075632712f Merge "Revert "Make embedded_launcher true by default"" into main am: 291a4912d1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3039633

Change-Id: I51031f3ea968ad82b6233e4656cdcd8cb5ce20b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 17:38:06 +00:00
Jihoon Kang
033ffb9533 Merge "Collect aconfig_declarations of the dependent java_aconfig_library modules" into main 2024-04-11 17:37:58 +00:00
Spandan Das
0c5dee6f99 Merge "Revert "Add the implicit deps of javacRE"" into main am: d5b05655bb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3037722

Change-Id: I55fca70c2f564ce7e93c200e1f1d11b058d7bddd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 17:36:21 +00:00
Charlie Boutier
291a4912d1 Merge "Revert "Make embedded_launcher true by default"" into main 2024-04-11 17:21:35 +00:00
Spandan Das
d5b05655bb Merge "Revert "Add the implicit deps of javacRE"" into main 2024-04-11 16:53:12 +00:00
Charlie Boutier
578066be90 Revert "Make embedded_launcher true by default"
This reverts commit 8a038ed871.

Reason for revert: investigate breaking test suits Avatar and BumbleBluetoothTests

Change-Id: I8e4498fb5854bf62df6d161ac0c6cce49d471afe
2024-04-11 16:10:00 +00:00
Ivan Lozano
85624b4d7f Merge "rust: Fix handling of bindgen header libs" into main am: 2aee601e95 am: 85f2a597d6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3016907

Change-Id: I1815c82fe3a8526f230013948775c0a1efbe9ef3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 14:02:54 +00:00
Ivan Lozano
85f2a597d6 Merge "rust: Fix handling of bindgen header libs" into main am: 2aee601e95
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3016907

Change-Id: I8179d150d9a3e166709d391e98ce32cc1f6d8011
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 13:38:15 +00:00
Ivan Lozano
2aee601e95 Merge "rust: Fix handling of bindgen header libs" into main 2024-04-11 13:20:46 +00:00
Anna Bauza
d0476e4652 Revert "Add the implicit deps of javacRE"
This reverts commit eaa475107d.

Reason for revert: This cl broke AOSP build, read more b/333846153

Change-Id: I5538a3c78617d7c2db98a11b60cb61269dcec8d3
2024-04-11 09:58:46 +00:00
Treehugger Robot
3e7d32f73f Merge "rustc-1.77.1 Build 11685613" into main am: d344c35e94 am: 2d72d67ff8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3031206

Change-Id: I52818df40e1a2958b5ab04e2549a092581902cb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 00:25:32 +00:00
Treehugger Robot
2d72d67ff8 Merge "rustc-1.77.1 Build 11685613" into main am: d344c35e94
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3031206

Change-Id: I315b3f09f6ad304bc4f876c6cd2c8aa29bf5c623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 00:14:54 +00:00
Treehugger Robot
d344c35e94 Merge "rustc-1.77.1 Build 11685613" into main 2024-04-11 00:06:30 +00:00
Cole Faust
ddd636e9ae Merge "Make embedded_launcher true by default" into main am: e35973bcef am: 6f97c3ab90
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3015502

Change-Id: I1d35b400cb36e910bbd981fdd5c5ad5d12981bd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-10 23:04:02 +00:00
Cole Faust
6f97c3ab90 Merge "Make embedded_launcher true by default" into main am: e35973bcef
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3015502

Change-Id: Ia6dce2356df0864aab1901a95ba280667052c13c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-10 22:58:58 +00:00
Cole Faust
e35973bcef Merge "Make embedded_launcher true by default" into main 2024-04-10 22:56:19 +00:00
Steven Moreland
f7886835fb Merge "Use __BIONIC_DEPRECATED_PAGE_SIZE_MACRO." into main am: 8d1b2db53f am: 89f7f60159
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3031204

Change-Id: I680d10a71bb0b4b679fd66ada594e27940a1e93d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-10 21:12:35 +00:00
Steven Moreland
89f7f60159 Merge "Use __BIONIC_DEPRECATED_PAGE_SIZE_MACRO." into main am: 8d1b2db53f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3031204

Change-Id: I45c54567d952b5051dcda99fe860193cf4991125
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-10 21:05:38 +00:00
Steven Moreland
8d1b2db53f Merge "Use __BIONIC_DEPRECATED_PAGE_SIZE_MACRO." into main 2024-04-10 20:57:45 +00:00
Spandan Das
6936459dbb Merge "Add the implicit deps of javacRE" into main am: fc4d366e38 am: 0dce877166
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3034456

Change-Id: If2deccc7f2dd1f1e2a24a5f5cda50305d1806c97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-10 20:31:53 +00:00
Spandan Das
0dce877166 Merge "Add the implicit deps of javacRE" into main am: fc4d366e38
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3034456

Change-Id: Icad1fc574d0093c823f2660b359d580bce35cacc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-10 20:26:53 +00:00
Spandan Das
fc4d366e38 Merge "Add the implicit deps of javacRE" into main 2024-04-10 20:20:43 +00:00
Treehugger Robot
7b5416aaff Merge "release_config: Initial implementation" into main am: 48d11dde95 am: 3ee3949831
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3032183

Change-Id: I9a9dba9e6635e217e85c4befb37c6b0d7240d9aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-10 18:18:09 +00:00
Treehugger Robot
3ee3949831 Merge "release_config: Initial implementation" into main am: 48d11dde95
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3032183

Change-Id: I5b24fb56cf071ade93cc6f55b29edfef28c299ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-10 18:03:37 +00:00
Treehugger Robot
48d11dde95 Merge "release_config: Initial implementation" into main 2024-04-10 17:48:21 +00:00
LaMont Jones
1eccbf24c5 release_config: Initial implementation
Bug: 328495189
Test: manual
Change-Id: I25a2a197f0227bfa7c63e0dfb7cab09e7d756d90
2024-04-10 09:34:26 -07:00
David Lin
02845621a9 [automerger skipped] Merge changes from topic "cherrypicker-L88000030002643591:N40800030043523326" into 24D1-dev am: 484939f4ac -s ours
am skip reason: Merged-In I29c605adb9401c9cb8b58646f2ae7b53b9a758e9 with SHA-1 de57c7a324 is already in history

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

Change-Id: Ia4168512b4ba621c508c74db8f5d0b6a5be4ad46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-10 15:49:53 +00:00
Jihoon Kang
0bc4aa9861 [automerger skipped] Revert "Additional cleanup prior to adding the runtime stubs" am: 104faabd88 -s ours
am skip reason: Merged-In I29c605adb9401c9cb8b58646f2ae7b53b9a758e9 with SHA-1 de57c7a324 is already in history

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

Change-Id: Id9f32cbdf8f1bf9fe9110a6c39a7964179a11265
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-10 15:49:48 +00:00
David Lin
484939f4ac Merge changes from topic "cherrypicker-L88000030002643591:N40800030043523326" into 24D1-dev
* changes:
  Revert "Additional cleanup prior to adding the runtime stubs"
  Revert "Generate runtime stubs in droidstubs"
2024-04-10 15:30:15 +00:00
Paul Duffin
1816cde8ce java_sdk_library: Use WriteFileRule for writing permissions.xml
Use the `WriteFileRule` to write the permissions file for shared
libraries instead of generating a custom bash rule.

Test: TH
Change-Id: I904cf0742bfec46ed45ec7801bb9bd3dc3047185
2024-04-10 13:21:28 +01:00
Paul Duffin
7f5073a94a Remove unused writeFile var
Test: TH
Change-Id: I09922d8f837f41dad01bc64192fa174d988eb39a
2024-04-10 13:21:28 +01:00
Hsin-Yi Chen
66245afd1a Merge "Filter ABI dumps by LLNDK headers and version scripts" into main am: 1edffe1dc4 am: 1ad665f20c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3019094

Change-Id: Icc18d4dad1549d96c6147b3f2f3e44771efed10c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-10 09:13:04 +00:00