Commit Graph

81641 Commits

Author SHA1 Message Date
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
Spandan Das
d5b05655bb Merge "Revert "Add the implicit deps of javacRE"" into main 2024-04-11 16:53:12 +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
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
Ronald Braunstein
c560309e30 Add test-only and test-target fields to all_teams proto.
The `test-only` flag designates the module contains test-only, not
production code.  In order to generate code-coverage reports, we wanted
a way to filter out code (like java_library) that is test-only and
doesn't need to be in the report.
   The XXX_test modules will have test-only set automatically.
   For modules like `java_library`, users will be a able to set this in
   the Android.bp file.
   As a follow-up, I'll run some queries to find modules that are only
   reachable from top level test targets and mark them test-only as
   appropriate.

`test-only` is being added to the team.proto and will be written via the
`all_teams` target.

Currently, it is challenging to find "all top level test targets".
I'm adding another field to mark the target as a "top level test
target" if it is a XXX_test or XXX_test_host module.  The goal is to
mark all modules the user intended to run as a test, either with
tradefed or directly as a native test.

I added 'module-type/kind' to the proto so I can do some queries:

 gqui from  "flatten(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'
+--------------+----------+
|  teams.kind  | count(*) |
+--------------+----------+
| android_test |     1379 |
| art_cc_test  |       56 |
| cc_benchmark |       68 |
| cc_fuzz      |      515 |
| cc_test      |     3519 |
| cc_test_host |        6 |
| java_fuzz    |        5 |
| java_test    |      773 |
+--------------+----------+

% 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'
+--------------------------+----------+
|        teams.kind        | count(*) |
+--------------------------+----------+
| android_test             |     1379 |
| android_test_helper_app  |     1678 |
| art_cc_test              |       56 |
| art_cc_test_library      |       13 |
| cc_benchmark             |       68 |
| cc_fuzz                  |      515 |
| cc_test                  |     3519 |
| cc_test_host             |        6 |
| cc_test_library          |      484 |
| java_library             |        2 |
| java_test                |      773 |
| java_test_helper_library |       29 |
+--------------------------+----------+

All modules can be seen here: https://docs.google.com/spreadsheets/d/1Zqbh7lDDdlI1xVmrN9fZ8bm8XD7EoORjjiPqbMvAKgQ/edit#gid=396553017

FOLLOW UP cls:
  *) Add more top level tests, like sh_test and python_test
  *) Add validation so that only modules currently marked test-only
     can depend on modules marked test-only
  *) Remove test_spec, code_metadata, TestModuleProviderKey: aosp/2928500

Test: go test ./java ./cc ./android
Test: m blueprint_tests
Test: m nothing --no-skip-soong-tests
    !!  android already failing on selects_test
Test: m all_teams  && gqui from  "flatten(out/soong/ownership/all_teams.pb, teams)"

Change-Id: Ib97dca60989aa9d7f000727c92af2e354926f072
2024-04-09 16:36:29 -07:00
Jiyong Park
e2eacfd563 Merge "android_filesystem_defaults and visibility rule" into main am: 52a08486f3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3029264

Change-Id: I243cc5beff518a386ed03da649ef9fb65224c5b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-09 23:23:44 +00:00
Jiyong Park
52a08486f3 Merge "android_filesystem_defaults and visibility rule" into main 2024-04-09 23:06:43 +00:00
Cole Faust
50b1f9bd53 Remove "exported" ninja variables am: 8982b1c49e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3031205

Change-Id: Id9a465d5a056cdac16c1ba6f3b5596fdabfe0073
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-09 19:42:40 +00:00
Charisee
92b7f386e0 rustc-1.77.1 Build 11685613
Test: m rust
Change-Id: I381106a54245b5d096dfcb0b3449f7ef440d067c
2024-04-09 19:39:01 +00:00
Cole Faust
8982b1c49e Remove "exported" ninja variables
There was infrastructure to export ninja variables to bazel. Now that
the bazel migration is cancelled, we don't need it anymore.

Bug: 315353489
Test: m nothing
Change-Id: I298cc2ac7ebd004557be3b30d75f7357cab0b7a0
2024-04-09 09:42:37 -07:00
Hsin-Yi Chen
64b2d0389c Filter ABI dumps by LLNDK headers and version scripts
This commit changes the parameters to create LLNDK ABI dumps for 202404
and later versions. Soong invokes header-abi-linker with LLNDK headers
and version script rather than the implementation library's parameters.
The output dump contains more precise ABI information.

When soong compares the ABI with the prebuilt dumps in old versions,
it creates the source ABI dumps with the old parameters.

Test: make findlsdumps
Bug: 314010764
Change-Id: I228736188d07029ee1588b3502fd7c0061c104b9
2024-04-09 18:45:03 +08:00
Treehugger Robot
834a4f7c9f Merge "fix: required property doesn't track deps to java, apex, ..." into main am: ccd5b5545b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3029144

Change-Id: I0536092ec1b30d0d54cb69f6d226b9d4ff380c93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-09 03:29:40 +00:00
Treehugger Robot
ccd5b5545b Merge "fix: required property doesn't track deps to java, apex, ..." into main 2024-04-09 03:12:39 +00:00
Jiyong Park
f46b1af969 android_filesystem_defaults and visibility rule
android_systemimage_defaults is deleted and android_filesystem_defaults
is created so that we can have defaults not only for
android_system_image, but also all android_filesystem modules and its
derivatives.

Also, change adds a check which ensures that the partition_type of the
filesystem and its defaults are the same.

Bug: 330665150
Test: m
Change-Id: If635c794534ed89d264eaf7dfc406a8245b8e9f0
2024-04-09 11:26:15 +09:00
Nikolay Elenkov
196729ffda Merge "Add secretkeeper-v1-java to platform APIs" into main am: f28b5697b8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3003166

Change-Id: Ife5fd2c073cdcfa05cedac99421ac91af7b66fca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-09 02:11:32 +00:00
Nikolay Elenkov
f28b5697b8 Merge "Add secretkeeper-v1-java to platform APIs" into main 2024-04-09 01:59:35 +00:00
Jiyong Park
d300e50dec Merge "APEX can depend on non-APEX module and vice versa" into main am: 39011ef40c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3029143

Change-Id: I088a4b942d40a17c6bcf51d3b48645b50393d536
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-08 23:19:46 +00:00
Jiyong Park
39011ef40c Merge "APEX can depend on non-APEX module and vice versa" into main 2024-04-08 22:28:26 +00:00
Cole Faust
394158399e Merge changes from topics "replace_instead_of_append", "selects_get_and_get_default" into main am: 42a8b256af
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3028124

Change-Id: I55d6028ecc3667791d5eb8cde76c3a84706475d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-08 21:16:17 +00:00
Cole Faust
54d24cff2c Add tests for android:replace_instead_of_append am: 02dd6e5640
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3026026

Change-Id: Iee736e2738d770cbfaabc2459dc74cda2f29c511
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-08 21:16:13 +00:00
Cole Faust
42a8b256af Merge changes from topics "replace_instead_of_append", "selects_get_and_get_default" into main
* changes:
  Rename Evaluate() to Get() and add GetDefault()
  Add tests for android:replace_instead_of_append
2024-04-08 20:45:55 +00:00
Treehugger Robot
8a57bcba2f Merge "Remove Device VNDK version usage from Soong" into main am: ed2adb879f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3027063

Change-Id: Ib01a6ccb4e7074897d913cfb3ae47aef1cc153d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-08 19:47:41 +00:00
Treehugger Robot
ed2adb879f Merge "Remove Device VNDK version usage from Soong" into main 2024-04-08 19:24:36 +00:00
Steven Moreland
2a481368b8 Use __BIONIC_DEPRECATED_PAGE_SIZE_MACRO.
The default compilation behavior is set to be the future direction,
and a flag is set for backwards compatibility.

Bug: 312546062
Test: build/boot
Change-Id: Ibf87cbb2ab5da8640bcf7eb5f8cd643bf500e2e5
2024-04-08 18:59:10 +00:00
Nikita Ioffe
4864c7b8d3 Merge "Add support for rollback_index to android_filesystem module" into main am: 97d771adf4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3017838

Change-Id: I7ff0286037dadd9d715cd881c761e0fa63616a0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-08 11:24:31 +00:00
Nikita Ioffe
97d771adf4 Merge "Add support for rollback_index to android_filesystem module" into main 2024-04-08 11:20:39 +00:00
Hsin-Yi Chen
2746e99c86 Merge "Let LLNDK implementation libraries depend on LLNDK headers" into main am: d22fcc425e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3016417

Change-Id: Ifc80de67e9aac29447902e5d1e413dc8c971af9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-08 02:33:47 +00:00
Hsin-Yi Chen
d22fcc425e Merge "Let LLNDK implementation libraries depend on LLNDK headers" into main 2024-04-08 02:06:13 +00:00
Jihoon Kang
4972943ead Merge "Revert^2 "Include all_aconfig_declarations in docs dist"" into main am: afacc090e8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3028264

Change-Id: I9db1308fd6f5c5f57254b03590a3217ce88f3e9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-05 18:14:45 +00:00
Jihoon Kang
afacc090e8 Merge "Revert^2 "Include all_aconfig_declarations in docs dist"" into main 2024-04-05 17:53:22 +00:00
Jiyong Park
73e5babafe fix: required property doesn't track deps to java, apex, ...
This change fixes a bug that the required property doesn't track
dependencies to modules whose arch is common.

Bug: 321000103
Bug: 321626681
Test: go test ./...
Change-Id: I3d2b3ad8cb2a9f1c5c3d5345bf05402a787f011a
2024-04-05 15:12:16 +09:00