Commit Graph

3062 Commits

Author SHA1 Message Date
Liz Kammer
c51a310131 Merge "Add property api_levels_jar_filename to droidstubs" am: 9c55b0efa2 am: a4278eba24
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1388544

Change-Id: Ic593590f8f3be3c66bcaa4d0a837dbe9fe865152
2020-08-06 13:11:11 +00:00
Liz Kammer
898ed67ecd Merge "Refactor java compileDex" am: 9eb51fc9d4 am: 46971c5469
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1360617

Change-Id: I574bbe46916d6e268956732f37022ba5f464fcaa
2020-08-06 13:10:52 +00:00
Liz Kammer
9c55b0efa2 Merge "Add property api_levels_jar_filename to droidstubs" 2020-08-05 19:05:13 +00:00
Andrei Onea
9bdaf74c97 Rename hiddenapi manual lists
Use new names for lists from go/hiddenapi-list-renaming
Bug: 162827370
Test: m

Change-Id: I9522f32faa46d1d49aefad0921ba6d9c427d8779
2020-08-05 18:43:25 +01:00
Liz Kammer
9eb51fc9d4 Merge "Refactor java compileDex" 2020-08-05 15:41:03 +00:00
Liz Kammer
a7a64f3c5b Refactor java compileDex
We want to support a compile_dex property for java_import. This splits
dex-related properties into a dexer struct which can be embedded in
relevant modules.

Test: m
Test: soong tests
Bug: 160455085
Change-Id: If56a51dac43f630d49483a36db29cd50e9ccd529
2020-08-04 10:15:04 -07:00
Liz Kammer
3d894b728a Add property api_levels_jar_filename to droidstubs
The default is android.jar to maintain current behavior but allows users
to specify a different filepath to support generating api-versions for
docs other than the platform (e.g. auto).

Bug: 162552181
Test: m doc
Test: go test java_test
Change-Id: I9e51abaf7d5451d68ca782157d9b739f76c5da82
2020-08-04 09:55:13 -07:00
Andrei Onea
ca79081bde Rename hiddenapi manual lists
Use new names for lists from go/hiddenapi-list-renaming
Bug: 162827370
Test: m

Change-Id: I9522f32faa46d1d49aefad0921ba6d9c427d8779
2020-08-04 15:34:35 +01:00
Treehugger Robot
c03dc74149 Merge "Update language to comply with inclusive guidance" am: cf04073b43 am: abeb7c4538
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1374706

Change-Id: Ie032c705309843d27f26699818fa6a8065808a99
2020-07-31 23:35:03 +00:00
Treehugger Robot
cf04073b43 Merge "Update language to comply with inclusive guidance" 2020-07-31 22:50:49 +00:00
Treehugger Robot
96ed484994 Merge "Default to not creating stubs for droiddoc" am: 703ea006e0 am: efb9bb4034
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1380730

Change-Id: Ibaca8954db797d938b6dff10c18014b9f2a97980
2020-07-31 19:46:04 +00:00
Treehugger Robot
703ea006e0 Merge "Default to not creating stubs for droiddoc" 2020-07-31 19:32:11 +00:00
Paul Duffin
0f460aa9db Fix prebuilt mutator ordering in tests am: 021f4e525f am: 8537c9cb30
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1380179

Change-Id: I77be0b785a95bdb943c8ead613f8e2d7b1d32776
2020-07-31 17:45:54 +00:00
Liz Kammer
1e2ee12ff4 Default to not creating stubs for droiddoc
This will allow us to remove `create_stubs: false` throughout the
codebase easily, then remove the functionslity to create stubs from
droiddoc.

Test: m docs
Test: m checkapi
Test: m updateapi
Bug: 144248501
Bug: 143136634

Change-Id: Ib95f68bc064fbe1475e4b25433bee6292bc005dc
2020-07-31 10:11:25 -07:00
Paul Duffin
021f4e525f Fix prebuilt mutator ordering in tests
Previously, the prebuilt mutators were added by the
cc.RegisterRequiredBuildComponentsForTest() function as a convenience
but unfortunately it lead to some of the mutators being in a different
order in the tests than in the normal build.

This change:
* Extracts the RegisterPrebuiltMutators() call from
  cc.RegisterRequiredBuildComponentsForTest()
* Makes sure that the prebuilt mutators are registered before the
  visibility gatherer and enforcer mutators.

Bug: 162505935
Test: m nothing
Change-Id: I7d959b558200b502f0a5e4653c41ea01414e142a
2020-07-31 16:12:01 +01:00
Andrei-Valentin Onea
48ca1e86e9 Merge "Update language to comply with Android's inclusive language guidance" am: 01124262f0 am: 06bd410548
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1374496

Change-Id: Ia00d11ee4c75298b67e254e8a51924e5e154e4d5
2020-07-30 12:42:53 +00:00
Andrei-Valentin Onea
01124262f0 Merge "Update language to comply with Android's inclusive language guidance" 2020-07-30 12:09:00 +00:00
Aleksei Kalinov
f0f5cdc1cc Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for
reference.

Bug: 161896447
Test: ran `m`.
Change-Id: If5ec29482911c281bc1c4bf2cfc84b2f05c2240d
2020-07-29 15:49:05 +00:00
Treehugger Robot
ad9cc7a602 Merge "Update language to comply with inclusive guidance" am: 0ebab772f5 am: 4b60484e5e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1374704

Change-Id: Iaad293fce923748a6fba122f2ad234986ff73d9a
2020-07-29 04:14:13 +00:00
Treehugger Robot
0ebab772f5 Merge "Update language to comply with inclusive guidance" 2020-07-29 03:41:51 +00:00
Treehugger Robot
375337b0c8 Merge "Inclusive fix: Replace sanity to validation in java/sdk.go" am: 3d8e506c3a am: ffdfccd54c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1374701

Change-Id: Iabe7ddfd5308a39ac1988a595faf02dde0e9370c
2020-07-29 00:11:05 +00:00
Treehugger Robot
3d8e506c3a Merge "Inclusive fix: Replace sanity to validation in java/sdk.go" 2020-07-28 23:39:20 +00:00
Liz Kammer
cada807a92 Update language to comply with inclusive guidance
Update android_app_set to use word install rather than master for
android_app_sets, this better matches the phrasing used for apex_set.

See https://source.android.com/setup/contribute/respectful-code for
reference

Bug: 161896447
Test: m nothing
Change-Id: I429e7f8b16c42c10ad4d9543110f5ce814a893b1
2020-07-28 15:47:38 -07:00
Treehugger Robot
c27bb4650c Merge "Update language to comply with inclusive guidance" am: 9326ba770c am: ebdbfbf539
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1374702

Change-Id: Ib9d0835e842474dbf244eebd08cc0c774170db98
2020-07-28 21:50:28 +00:00
Liz Kammer
7941b30c67 Update language to comply with inclusive guidance
See https://source.android.com/setup/contribute/respectful-code for
reference

Bug: 161896447
Test: m nothing
Change-Id: I13f42b680c6b819a2708c973e7718267c121f862
2020-07-28 13:27:34 -07:00
Liz Kammer
20ebfb46fc Update language to comply with inclusive guidance
See https://source.android.com/setup/contribute/respectful-code for
reference

Bug: 161896447
Test: m nothing
Change-Id: Ie1d0d63d27f1b1b48680922b7202aa6df04f4696
2020-07-28 11:37:31 -07:00
Patrice Arruda
b481b87104 Inclusive fix: Replace sanity to validation in java/sdk.go
Bug: b/161896447
Test: "lunch 1" and "m nothing"
Change-Id: I8cbdec02dccd961a8cac92c6e957aeebd1e263c1
2020-07-28 18:30:44 +00:00
Liz Kammer
82fdacaf3c Merge "Add data_native_bins property to java_test_host" am: 8ffde8c9d5 am: 30de260bee
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1358802

Change-Id: I090dafbabe34c88dcd394960798499129746294f
2020-07-28 16:42:04 +00:00
Liz Kammer
dd849a81f3 Add data_native_bins property to java_test_host
When multiple os/arch variants are supported, java_test_host could not
find a matching arch due to java having arch:common, whereas native
binaries support a specific architecture. This change adds the property
`data_native_bins` in order to support binaries with the appropriate
os/arch variants.

Test: m FirmwareDtboVerification with data_native_bins
Test: forrest
Bug: 153848038
Change-Id: I45adebff0fde2811d5ef5620c697b97b768c951f
2020-07-27 09:14:06 -07:00
Treehugger Robot
4826c2668d Merge "Build transitive lint reports for apex modules" am: 13aa44fc15 am: 5388d97b37
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1370779

Change-Id: I08069e90ec451f09aa7bbea3e8b4834d6cb7ef67
2020-07-24 12:16:40 +00:00
Treehugger Robot
13aa44fc15 Merge "Build transitive lint reports for apex modules" 2020-07-24 11:50:39 +00:00
Dan Stoza
d550a9a6e6 Merge "Add SettingsRoboTests to the allow-list for legacy core/platform API." into stage-aosp-master am: e05c751f38
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12220305

Change-Id: Ie520daea74b7847e8e307d1f2c5b4e356935e8f2
2020-07-23 22:40:06 +00:00
Pete Gillin
d5c16eb731 Add SettingsRoboTests to the allow-list for legacy core/platform API.
Bug: 161967461
Test: m SettingsRoboTests
Change-Id: If4e58fba5f74dd06457497c1d131bc1f273f6f5b
2020-07-23 20:47:11 +00:00
Pete Gillin
9f4893d86f Add SettingsRoboTests to the allow-list for legacy core/platform API.
Bug: 161967461
Test: m SettingsRoboTests
Merged-In: I15e5a6c2f07e73718803501d705de0d7ab9bec90
Change-Id: If4e58fba5f74dd06457497c1d131bc1f273f6f5b
2020-07-23 12:34:07 +01:00
Pete Gillin
84c3807b99 Enforce the legacy core/platform API restriction.
This change silently decides whether modules which depend on either
sdkPrivate or sdkCorePlatform get the legacy or the stable version of
the core/platform API, based on whether the module's name is on a
hard-coded list or not.

Test: m java
Test: make a target from the list when its entry is commented out, which correctly fails
Bug: 157640067
Change-Id: I15e5a6c2f07e73718803501d705de0d7ab9bec90
Merged-In: I15e5a6c2f07e73718803501d705de0d7ab9bec90
Merged-In: Iaa97ddaa015e8079fcb3426585c5101c7ec9e22a
(cherry picked from commit c0f4373106)
2020-07-23 09:06:52 +01:00
Colin Cross
08dca38eb0 Build transitive lint reports for apex modules
Build and export transitive lint report zips for apex modules.

Bug: 153485543
Test: m TARGET_BUILD_APPS=com.google.android.wifi lint-check dist
Change-Id: I5a1805440452301a7e2c4ca91482b989638b54fb
2020-07-22 20:16:14 -07:00
Pete Gillin
e64cf6e0ff Placeholder for enforcement of the legacy core/platform API restriction.
This does is as similar as possible to the equivalent changes in AOSP
and internal masters, without actually doing any enforcement. This
means we don't have to maintain a third hard-coded list for rvc, while
minimizing the diffs. The list here is identical to the one in AOSP
master, so changes from there should merge down cleanly (and have no
effect).

Test: m java checkapi
Bug: 157640067
Change-Id: Iaa97ddaa015e8079fcb3426585c5101c7ec9e22a
Merged-In: I15e5a6c2f07e73718803501d705de0d7ab9bec90
(cherry picked from commit c0f4373106)
2020-07-22 17:42:24 +01:00
Treehugger Robot
00317f0660 Merge "Generate module lib API and scope together" am: 0bcda81dd5 am: 6e6dd4be10
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1367357

Change-Id: I047e414976c4eae6bfec37aa1c18bed2f6cb4063
2020-07-21 04:45:26 +00:00
Treehugger Robot
0bcda81dd5 Merge "Generate module lib API and scope together" 2020-07-21 04:21:07 +00:00
Treehugger Robot
8d00cdaee4 Merge "Add dist target for robolectric-tests.zip" am: 30c22b9c7a am: e45c3b1c6a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1367538

Change-Id: I145b4cb0fb1bec28a48ea42ca23ac236edbec175
2020-07-21 02:38:10 +00:00
Treehugger Robot
30c22b9c7a Merge "Add dist target for robolectric-tests.zip" 2020-07-21 02:03:36 +00:00
Colin Cross
cf0e4220eb Add dist target for robolectric-tests.zip
Also remove stray fmt.Println.

Test: m robolectric-tests
Change-Id: Ia463c2b395fadd6ab33b2ce8364f2119b2a2be1e
2020-07-20 17:19:02 -07:00
Paul Duffin
15f34ef811 Generate module lib API and scope together
Previously, due to limitations in metalava the module lib API and stubs
source were generated separately. That limitation has since been
removed so this change optimizes the generating code.

Changes:
* Add an annotation field to apiScope to contain the annotation that
  identifies the scope.
* Rename droidstubArgs to extraArgs to better reflect that they are not
  passed to droidstubs.
* Rename droidstubsArgsForGeneratingStubsSource to droidstubsArgs.
* Remove droidstubsArgsForGeneratingApi and
  createStubsSourceAndApiTogether fields along with code that supports
  generating stubs source and the API separately.
* Fix the module lib test.

Test: m checkapi
Bug: 161364853
Change-Id: I821886bb68645addf5ae9c96ed2f4f3649151d1a
2020-07-20 20:51:25 +01:00
Colin Cross
6a472cd688 Merge "Add environment variables to control lint checks" am: dd35943b62 am: a333c3ee62
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1364949

Change-Id: I81c68864c55e36aa800cb95627b7939578cd2752
2020-07-20 19:05:11 +00:00
Colin Cross
e078e398ab Merge "Package robolectric tests for tradefed" am: f0ba57bf33 am: b2760fd03d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1221882

Change-Id: Id9de4fe54ddabe54b07167f4e177ba0cb036a1a0
2020-07-20 19:05:00 +00:00
Colin Cross
dd35943b62 Merge "Add environment variables to control lint checks" 2020-07-20 18:50:09 +00:00
Colin Cross
f0ba57bf33 Merge "Package robolectric tests for tradefed" 2020-07-20 18:27:17 +00:00
Colin Cross
8eebb135b3 Package robolectric tests for tradefed
Package a slightly modified copy of the robolectric tests with
the dependencies statically included into the testcases directory
and into a robolectric-tests.zip.

Test: m robolectric-tests
Change-Id: I73f51727695136d2a849d36af1683e93f7e156a3
2020-07-19 19:33:40 -07:00
Makoto Onuki
d786b6bffe Merge "Repeat metalava errors at the end to make it easy to find them" am: d3cd2f5793 am: 0742acdc4b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1365957

Change-Id: Ifca7b65f4e27bf14cdc30f72f790b0de90130bae
2020-07-18 03:17:41 +00:00
Makoto Onuki
d3cd2f5793 Merge "Repeat metalava errors at the end to make it easy to find them" 2020-07-18 02:29:36 +00:00