Commit Graph

81669 Commits

Author SHA1 Message Date
Ronald Braunstein
d38b96ed96 Merge "Add "test-only" flag for java modules" into main am: 720146b2f2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3040036

Change-Id: I5a866ad14459690793baa52d56704728276dbb2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-12 23:35:36 +00:00
Ronald Braunstein
720146b2f2 Merge "Add "test-only" flag for java modules" into main 2024-04-12 23:13: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
Ronald Braunstein
cdc66f4268 Add "test-only" flag for java 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 java modules.

We let users set "test-only" on java_library, but not on other modules
where the module kind is implicitly test-only, like java_test.
The implementation, not the user decides it is test-only.
We also exclude it from java_defaults.

	% 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 and teams.kind not like "%cc_%" group by teams.kind'
	+--------------------------+----------+
	|        teams.kind        | count(*) |
	+--------------------------+----------+
	| android_test             |     1382 |
	| android_test_helper_app  |     1680 |
	| java_fuzz                |        5 |
	| java_test                |      774 |
	| java_test_helper_library |       29 |
	+--------------------------+----------+

	 % 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 and teams.kind not like "%cc_%" group by teams.kind'
	+--------------+----------+
	|  teams.kind  | count(*) |
	+--------------+----------+
	| android_test |     1382 |
	| java_fuzz    |        5 |
	| java_test    |      774 |
	+--------------+----------+

Test: m nothing --no-skip-soong-tests
Test: go test ./java
Test: m all_teams

Bug: b/327280661
Change-Id: I9c3ad947dc3d68d6427abada27449526d69daa6b
2024-04-12 11:42:10 -07: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
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
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
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
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
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
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
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
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
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
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
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
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
1ad665f20c Merge "Filter ABI dumps by LLNDK headers and version scripts" into main am: 1edffe1dc4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3019094

Change-Id: Icd5bf9027880a22ebf71ae0a8667a7d873ad401a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-10 08:58:20 +00:00
Hsin-Yi Chen
1edffe1dc4 Merge "Filter ABI dumps by LLNDK headers and version scripts" into main 2024-04-10 08:36:07 +00:00
Ronald Braunstein
1f34b78590 Merge "Add test-only and test-target fields to all_teams proto." into main am: 98d46751ef
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3022586

Change-Id: Ic9171a03f07493ab3026dec6060b0d7fda13ff40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-10 01:12:17 +00:00
Ronald Braunstein
98d46751ef Merge "Add test-only and test-target fields to all_teams proto." into main 2024-04-10 00:50:34 +00:00
Spandan Das
eaa475107d Add the implicit deps of javacRE
This includes
1. the prebuilt javac binary
2. the input .java files
3. the jars that are placed on the classpath during javac

(2) is passed via ${out}.rsp. This rsp file gets populated with the
input java files

For (3), this CL creates a new intermediate file whose content is
comma separated jars available on the classpath (this is the format
expected by rewrapper). This file is then registered in RSPFiles of
javacRE command, so that it gets passed to the rewrapper cmd as
`--input_list_paths`

(rspfiles are necesary for modules like framework-minus-apex to avoid
exceeding cmd line limits)

Bug: 308687455
Test: m framework-minus-apex; # verified that the relevant files are
added as `--inputs` of javac

Change-Id: I2ab9277fc394eb00454ef503c78a9f3451e596ac
2024-04-10 00:37:31 +00:00
Aditya Kumar
93329bc248 Merge "Add deps to blocklist path" into main am: c63c4306c0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2990009

Change-Id: I68ca596893ca4d89109432df08aff9f4b5faf9e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-10 00:13:01 +00:00
Aditya Kumar
c63c4306c0 Merge "Add deps to blocklist path" into main 2024-04-09 23:49:13 +00:00