Commit Graph

6146 Commits

Author SHA1 Message Date
Colin Cross
cfb0f5e102 Support per-testcase directories in all test suites
There are cases where two modules try to install the same test data
into CTS, which results in collisions when CTS puts the data for all
tests in the same directory.  Add a flag that allows enabling a
per-testcase directory for an individual test for all test suites.

Bug: 193168159
Test: cts-tradefed run commandAndExit CtsBionicTestCases
Change-Id: If034723e8fe937ca71d3e2d39b7d46702e41bc8c
2021-09-27 15:56:26 -07:00
Jiakai Zhang
d62b5d09de Merge "Remove updatable-bcp-packages.txt." am: a14b18fb31 am: b9e3166b14 am: 4d0288d834 am: 6931fd6d16 am: 283cac1e7c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832483

Change-Id: I69bdcc61579ec544c02b90c6e1b101a4bbe30d5e
2021-09-26 04:54:02 +00:00
Jiakai Zhang
b9e3166b14 Merge "Remove updatable-bcp-packages.txt." am: a14b18fb31
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832483

Change-Id: If17f9cb0d0cef77ea2d2fc3f0ddac177f449daca
2021-09-26 03:47:03 +00:00
Jiakai Zhang
a14b18fb31 Merge "Remove updatable-bcp-packages.txt." 2021-09-26 03:34:28 +00:00
Colin Cross
e960435684 Merge "Add phony name for robolectric tests" am: ffe2c918e9 am: 11a32a918b am: 7c26a0cc17 am: 424be4ecef am: 19673f3632
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1831866

Change-Id: If2cacb7c3a0c004946dc0f0c5d7fe5dbb1750c4a
2021-09-24 21:12:18 +00:00
Colin Cross
11a32a918b Merge "Add phony name for robolectric tests" am: ffe2c918e9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1831866

Change-Id: I94f283455b3ddecad3d932d7bdbdab902ff211ee
2021-09-24 20:08:33 +00:00
Colin Cross
ffe2c918e9 Merge "Add phony name for robolectric tests" 2021-09-24 19:51:41 +00:00
Colin Cross
8304a1330e Add phony name for robolectric tests
Robolectric tests are installed by Soong, which means Make doesn't
know about the install location to create the phony rules.  Add
a phony rule in Soong for now until Soong's installation rules are
fleshed out.

Bug: 184946827
Test: m SettingsRoboTests
Change-Id: I60d76474949800e1a737714d86df84eff9a92214
2021-09-24 10:41:55 -07:00
Martin Stjernholm
a319fb4a81 Merge changes I957f3df8,I68986dcc am: cf6bf37d04 am: 40fc93fb3c am: 5fc64d1ac8 am: 97c84c01f3 am: a2ca15f88e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1829372

Change-Id: I0e045aa01c2e5ba8e23ef27d3f05786722d94fc9
2021-09-24 10:40:09 +00:00
Martin Stjernholm
40fc93fb3c Merge changes I957f3df8,I68986dcc am: cf6bf37d04
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1829372

Change-Id: Ifcf471f2746c1037b83c2a11b8f5120b86fd6cb2
2021-09-24 09:44:00 +00:00
Martin Stjernholm
cf6bf37d04 Merge changes I957f3df8,I68986dcc
* changes:
  Consolidate the code to resolve a deapexer module dependency.
  Propagate the dex jar path as an OptionalPath which is either valid or invalid with a message.
2021-09-24 09:32:24 +00:00
Jiakai Zhang
46eb0fd501 Remove updatable-bcp-packages.txt.
Historically, this file was used by the `--updatable-bcp-packages-file`
flag for dex2oat. The flag is no longer needed and is being deprecated.

Unfortunately, we cannot remove `permitted_packages` and all the code
related to it because we still need it for checking the module
compatibility with Q and R.

Bug: 200241946
Test: m nothing
Change-Id: Ie3be54fd47a847ba0caf627d12da76b415d99466
2021-09-24 03:19:05 +00:00
Treehugger Robot
40660d21f8 Merge "Changes tree built Robolectric name" 2021-09-23 21:04:51 +00:00
Martin Stjernholm
4482560cc7 Consolidate the code to resolve a deapexer module dependency.
It will get more logic in upcoming CLs.

Add a property to DeapexerInfo for the APEX name, for use in error
messages.

Test: m nothing
Bug: 192006406
Change-Id: I957f3df8b34543a38cde38768dac93e78132d672
2021-09-23 17:19:55 +01:00
Martin Stjernholm
8be1e6db16 Propagate the dex jar path as an OptionalPath which is either valid or
invalid with a message.

This will allow propagating any error from the deapexer module for
prebuilt APEXes to the location where the dex jars get used. It's only
at those points that we can raise errors about not being able to
extract files from the deapexer modules if they are invalid, and this
way we avoid encoding knowledge there about why they may be invalid.

To keep the refactoring limited it intentionally does not change any of
the existing logic for when dexJarFiles are set or not (non-nil vs nil
prior to this change), although there may be opportunity to use this
for more conditions when dex jars aren't available.

The refactoring is also not extended to
dexpreopt.ClassLoaderContextMap.

Test: m nothing
Bug: 192006406
Change-Id: I68986dccd9a9b3fee4d24caa1947ea17a36caedc
2021-09-23 17:19:55 +01:00
TreeHugger Robot
086cb94b7f Merge "Changes tree built Robolectric name" into stage-aosp-master 2021-09-23 15:58:22 +00:00
Anton Hansson
1c832eeb36 Merge "Add annotations.zip support to java_sdk_library" am: 86da9c6a3d am: 52b99b10f5 am: 40ef0e9141 am: 9ef920bcb1 am: ee9ab003bb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832255

Change-Id: I10e4e4c5188f0a0297ee2baa1b5cf4a1b0f234a9
2021-09-23 10:41:47 +00:00
Anton Hansson
40ef0e9141 Merge "Add annotations.zip support to java_sdk_library" am: 86da9c6a3d am: 52b99b10f5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832255

Change-Id: I6a6b8a3484eccea2999c45c2d49aa8af4cac229b
2021-09-23 10:02:18 +00:00
Anton Hansson
52b99b10f5 Merge "Add annotations.zip support to java_sdk_library" am: 86da9c6a3d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832255

Change-Id: Id5625d0cc95fa1d235ee5eed6c008b9f555f876b
2021-09-23 09:49:26 +00:00
Anton Hansson
86da9c6a3d Merge "Add annotations.zip support to java_sdk_library" 2021-09-23 09:39:38 +00:00
Joseph Murphy
69e65b3fcd Changes tree built Robolectric name
Bug: b/194219998
Test: locally ran all in-tree Robolectric tests
Change-Id: If13583f6a2882e2e78d3004afc476debf6692df9
Merged-In: If13583f6a2882e2e78d3004afc476debf6692df9
2021-09-23 00:48:34 +00:00
Dan Willemsen
b41e2f6d95 Merge "Add java_binary_host support for Windows" am: b13daf2ba7 am: e8273d7bb0 am: f17feb05d7 am: 6f07dcfa71 am: a346cbaeb6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832212

Change-Id: I12e9b9009f01d03c46b90b2b904990ef85da8036
2021-09-22 21:16:23 +00:00
Dan Willemsen
f17feb05d7 Merge "Add java_binary_host support for Windows" am: b13daf2ba7 am: e8273d7bb0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832212

Change-Id: I754592162b305de2f64089985f40ca195c229ab1
2021-09-22 20:39:36 +00:00
Dan Willemsen
e8273d7bb0 Merge "Add java_binary_host support for Windows" am: b13daf2ba7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832212

Change-Id: I689e0da48cde43581890a8f46e185825a9984035
2021-09-22 20:27:45 +00:00
Dan Willemsen
b13daf2ba7 Merge "Add java_binary_host support for Windows" 2021-09-22 20:13:33 +00:00
Joseph Murphy
c964841e2d Changes tree built Robolectric name
Bug: b/194219998
Test: locally ran all in-tree Robolectric tests
Change-Id: If13583f6a2882e2e78d3004afc476debf6692df9
Merged-In: If13583f6a2882e2e78d3004afc476debf6692df9
2021-09-22 17:58:07 +00:00
TreeHugger Robot
8c7089fde6 Merge "Changes tree built Robolectric name" into sc-dev-plus-aosp 2021-09-22 17:48:56 +00:00
Anton Hansson
d78eb76f64 Add annotations.zip support to java_sdk_library
The annotations zip file is produced by the "main" sdk build and is
primarily consumed by android studio.

In order to support building the main SDK without requiring the sources
of all modules, we are adding module SDK artifacts that allows
reconstructing these outputs. The annotations zip contains XML files
which should be fairly easy to merge from all the individual parts.

Bug: 187397779
Test: unit tests in this CL
Test: m sdkextensions-sdk and inspect output
Change-Id: I955cae720e6f1382936836ee1d8fb11003f51b7d
2021-09-22 17:23:10 +01:00
Treehugger Robot
ab6205e22a Merge "Remove workaround for modules with missing BCP fragments, as they are present now." am: cd439a27e4 am: d5082754e0 am: 66c1202ce3 am: a9f44c8c32 am: 12f420ce0d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1828596

Change-Id: I2fe8113ad0b003f2b656c12001b576e13e92c5f1
2021-09-22 11:28:23 +00:00
Treehugger Robot
d5082754e0 Merge "Remove workaround for modules with missing BCP fragments, as they are present now." am: cd439a27e4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1828596

Change-Id: I81f0280f4ef5082fb80d4d906fa766b7fb78a296
2021-09-22 10:36:55 +00:00
Treehugger Robot
cd439a27e4 Merge "Remove workaround for modules with missing BCP fragments, as they are present now." 2021-09-22 10:18:36 +00:00
Anton Hansson
825a2659e6 Merge "Add back the api_srcs argument" am: 8b1add6dd4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1830032

Change-Id: I1dd0b451e8d195e7f382b649aedadebb804a429f
2021-09-21 14:57:36 +00:00
Anton Hansson
8b1add6dd4 Merge "Add back the api_srcs argument" 2021-09-21 14:45:02 +00:00
Dan Willemsen
8e6b37119a Add java_binary_host support for Windows
So that the Windows build-tools package doesn't need to manually copy
the wrapper. Also fixes enabling java modules for Windows by hiding them
from Make, as the Make code does not handle Windows java modules
properly.

Bug: 187222815
Change-Id: I13534b38b9a9f4b5ff0630e028c3b4f88a6b34f8
2021-09-20 23:29:48 -07:00
Aurimas Liutikas
147f9f2f1a Merge "Enable compose kotlinc plugin when depending on the compose runtime" am: e992a52d0e am: 2fa15f76a3 am: 3181440486 am: 0b3bbaff0c am: 4329d9226d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1830673

Change-Id: I66fac23fd7cbf1d25acc5b778014c1183d4de51a
2021-09-21 00:50:38 +00:00
Aurimas Liutikas
2fa15f76a3 Merge "Enable compose kotlinc plugin when depending on the compose runtime" am: e992a52d0e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1830673

Change-Id: I8becfa1da6f0b03d0fd839b5e60b6a5f9c662821
2021-09-20 23:53:09 +00:00
Aurimas Liutikas
e992a52d0e Merge "Enable compose kotlinc plugin when depending on the compose runtime" 2021-09-20 23:28:33 +00:00
Martin Stjernholm
531d8fdc2a Remove workaround for modules with missing BCP fragments, as they are
present now.

#codehealth

Test: presubmits
Bug: 192868581
Change-Id: I8370525849ea589af0bf4f8d3fd081f3004516a1
2021-09-20 23:47:24 +01:00
Colin Cross
8039d30bca Merge "Add support for d8 --main-dex-rules" am: 80bb3164b9 am: 0abff32886 am: 9f7afbe3c3 am: 2c45744ff1 am: 8359d26217
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1829133

Change-Id: Ieb7376f4d1facc2352c4c274175712a343978227
2021-09-20 21:23:35 +00:00
Colin Cross
0abff32886 Merge "Add support for d8 --main-dex-rules" am: 80bb3164b9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1829133

Change-Id: Ib105939a0e11dae97b40cf003c75808ee1d879ec
2021-09-20 20:37:51 +00:00
Colin Cross
80bb3164b9 Merge "Add support for d8 --main-dex-rules" 2021-09-20 20:22:44 +00:00
Colin Cross
a1ff7c6926 Enable compose kotlinc plugin when depending on the compose runtime
When a module depends on the compose runtime add a -Xplugin argument
to the kotlinc flags that enables the compose compiler plugin.

Bug: 196351110
Test: TestKotlinCompose
Change-Id: I423a3c4d12df42804a24b672a40a165bc8dd165f
2021-09-20 09:12:42 -07:00
Treehugger Robot
3d3bb3f15c Merge "Add test to TestJavaStableSdkVersion for legacy core platform" am: 3769a27c5e am: 45dd37c6e3 am: 90a5e41516 am: da8ef1d18a am: 246e0d388c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655611

Change-Id: Ibf571a6f6c29de12d810989d83931f3b660971d2
2021-09-20 15:15:10 +00:00
Treehugger Robot
45dd37c6e3 Merge "Add test to TestJavaStableSdkVersion for legacy core platform" am: 3769a27c5e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655611

Change-Id: I752f24a2e6b9763019866402a8af6adb3e96ee2a
2021-09-20 14:20:18 +00:00
Treehugger Robot
3769a27c5e Merge "Add test to TestJavaStableSdkVersion for legacy core platform" 2021-09-20 14:04:35 +00:00
Anton Hansson
f8ea3729ca Add back the api_srcs argument
This arg provides the ability to pass sources to the metalava
invocations that are part of a java_sdk_library without affecting
the runtime library.

This is useful in various scenarios, e.g.: when javadoc in some source
files affects the metalava behavior. For example, the javadoc-generation
javadoc tags @paramDoc, @returnDoc etc. Passing these as a library does
not work because class files do not contain javadoc.

Bug: 186197911
Test: manually inspect module stub src for doc enhancements
Merged-In: I2ce98f891283514e1896c52d9335550c1f5435fb
Change-Id: I2ce98f891283514e1896c52d9335550c1f5435fb
2021-09-17 13:42:44 +00:00
Anton Hansson
84f61eeb1e [automerge] Add back the api_srcs argument 2p: b727c1e0ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15852934

Bug: 186197911
Change-Id: I3fdfdacf2c083cd7f4c1f88c657e8ab245927f6f
2021-09-17 13:21:39 +00:00
Anton Hansson
b727c1e0ba Add back the api_srcs argument
This arg provides the ability to pass sources to the metalava
invocations that are part of a java_sdk_library without affecting
the runtime library.

This is useful in various scenarios, e.g.: when javadoc in some source
files affects the metalava behavior. For example, the javadoc-generation
javadoc tags @paramDoc, @returnDoc etc. Passing these as a library does
not work because class files do not contain javadoc.

Bug: 186197911
Test: manually inspect module stub src for doc enhancements
Change-Id: I2ce98f891283514e1896c52d9335550c1f5435fb
2021-09-17 14:21:24 +01:00
Jiakai Zhang
7ef8c14573 Merge changes I9c94a54a,Idc0c73a7 am: 2c6ede11cc am: 23a5cba0af am: 57c29dd3e3 am: 36c6e5583f am: 9c4f4a179f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1824513

Change-Id: Ic1c8e0971d4807c92bdc8138a62c435862e70b69
2021-09-17 12:23:41 +00:00
Jiakai Zhang
d029384d38 Merge "Revert^2 "Preopt APEX system server jars."" am: c9f9d56ed4 am: dc2c1c2625 am: f3d12b3172 am: ac66e68946 am: 611a4eacc6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1828115

Change-Id: Ia5585ff7f08ef6c5c5ea7b2ecd544a25d63a89a8
2021-09-17 12:23:06 +00:00