Commit Graph

82362 Commits

Author SHA1 Message Date
Treehugger Robot
313714ce08 Merge "Add support for transitive resources to android_library_import" into main am: c5c54803e6 am: 7c1c3de7be
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3040832

Change-Id: Iaa438072ba7c8e1aa57df1dbd5fbb8b6dd1f6363
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-12 22:39:51 +00:00
Treehugger Robot
7c1c3de7be Merge "Add support for transitive resources to android_library_import" into main am: c5c54803e6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3040832

Change-Id: Iba70718a3e82398cc3015a17339672a1940d2d09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-12 22:20:34 +00:00
Treehugger Robot
c5c54803e6 Merge "Add support for transitive resources to android_library_import" into main 2024-04-12 22:04:27 +00:00
Colin Cross
607bbd64dd Add support for transitive resources to android_library_import
Collect and propagate resource jars from static dependencies of
android_library_import modules.

Bug: 288358614
Test: TestAndroidLibraryOutputFilesRel
Change-Id: I076f3c8e4ce42f71a52b612b77eb0265fa1e974c
2024-04-12 13:45:35 -07:00
Juan Yescas
8e38eca746 Include __BIONIC_NO_PAGE_SIZE_MACRO flag to avoid breaking libraries am: fc5cdcbdf5 am: fc49ee21fc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3040413

Change-Id: I98653d9eb710916ce3b638ff1e41b9e74b347a82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-12 17:48:19 +00:00
Juan Yescas
fc49ee21fc Include __BIONIC_NO_PAGE_SIZE_MACRO flag to avoid breaking libraries am: fc5cdcbdf5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3040413

Change-Id: Iefda868428491d586461c799c8af95c1e184693a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-12 17:25:08 +00:00
Juan Yescas
fc5cdcbdf5 Include __BIONIC_NO_PAGE_SIZE_MACRO flag to avoid breaking libraries
The __BIONIC_NO_PAGE_SIZE_MACRO flag has to be passed to
the build system because there are C/C++ libraries using
__BIONIC_NO_PAGE_SIZE_MACRO to decide whether to use getpagesize()
or PAGE_SIZE macro.

Bug: 333973679
Test: Build manually
Change-Id: Ie5d71f4b2b256ab8f429ed4724b8d249b364d5da
2024-04-12 07:06:12 +00:00
Jiakai Zhang
d2ce58d924 Merge "Refactor the contruction of the manifest check inputs." into main 2024-04-12 06:50:15 +00:00
Ronald Braunstein
a1b74a41f0 Add "test-only" flag for cc modules am: a115e2615b am: a16d4aada7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3035329

Change-Id: I193dcf5c64f8d32279c12cb56fe30e28853f091e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-12 03:59:54 +00:00
Ronald Braunstein
a16d4aada7 Add "test-only" flag for cc modules am: a115e2615b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3035329

Change-Id: Id29c3424b331a4c0973c069acdeba73037f88d3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-12 03:40:16 +00:00
Ronald Braunstein
a115e2615b Add "test-only" flag for cc modules
As part of aosp/3022586 where we added the idea of "test-only" modules
and top_level_test_targets, this CL implements that for cc_ modules.

We let users set "test-only" on cc_library, but not on other modules
where the module kind is implicitly test-only, like cc_test.
Here the implementation, not the user decides it is test-only.

% gqui from  "flatten(~/aosp-main-with-phones/out/soong/ownership/all_teams.pb, teams)" proto team.proto:AllTeams 'select teams.kind, count(*) where teams.top_level_target = true group by teams.kind'                    aosp_shiba[6:15:47]/0
+--------------+----------+
|  teams.kind  | count(*) |
+--------------+----------+
| art_cc_test  |       56 |
| cc_benchmark |       68 |
| cc_fuzz      |      515 |
| cc_test      |     3518 |
| cc_test_host |        6 |
+--------------+----------+

 % gqui from  "flatten(~/aosp-main-with-phones/out/soong/ownership/all_teams.pb, teams)" proto team.proto:AllTeams 'select teams.kind, count(*) where teams.test_only = true group by teams.kind'                           aosp_shiba[6:16:26]/0
+--------------------------+----------+
|        teams.kind        | count(*) |
+--------------------------+----------+
| art_cc_test              |       56 |
| art_cc_test_library      |       13 |
| cc_benchmark             |       68 |
| cc_fuzz                  |      515 |
| cc_test                  |     3518 |
| cc_test_host             |        6 |
| cc_test_library          |      484 |
+--------------------------+----------+

Bug: b/327280661

Test: m nothing --no-skip-soong-tests
Test: go test ./cc
Test: m all_teams
Change-Id: I344436c424a9dfbdcf27e10f42f5cebc3d2b1261
2024-04-12 02:15:05 +00:00
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