Jaewoong Jung
42688a9945
Merge "Clear remains of java.Dependency interface." am: 083e6cd267
am: a021326e92
am: d9119bc38f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1620201
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0be2ce1f1eda8b6a15f296899079bb70d04f7f2a
2021-03-05 23:19:07 +00:00
Jaewoong Jung
d9119bc38f
Merge "Clear remains of java.Dependency interface." am: 083e6cd267
am: a021326e92
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1620201
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id792437df796baa03e9f02fb24c9263342658edf
2021-03-05 22:35:34 +00:00
Jaewoong Jung
62751102a9
Clear remains of java.Dependency interface.
...
Test: TreeHugger
Change-Id: If9dab2022a308b776d7ad760a61f0db97509b9b2
2021-03-05 14:57:51 +00:00
Julien Desprez
239f36d0df
Merge "Revert "Attempt to run all java_test_host that look unit tests"" am: bbfd5f5e7c
am: f1fb4af6e9
am: 97b3107dbd
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1619801
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ied8f188c79f20db3815672249b4871879c0ddc8d
2021-03-05 06:20:37 +00:00
Julien Desprez
97b3107dbd
Merge "Revert "Attempt to run all java_test_host that look unit tests"" am: bbfd5f5e7c
am: f1fb4af6e9
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1619801
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic27644feb15de79119e81edb4c1c69b6b6688b0d
2021-03-05 05:54:51 +00:00
Julien Desprez
bbfd5f5e7c
Merge "Revert "Attempt to run all java_test_host that look unit tests""
2021-03-04 21:50:34 +00:00
Julien Desprez
1ab84fa433
Revert "Attempt to run all java_test_host that look unit tests"
...
Revert submission 1597083-java_test_host_default
Reason for revert: Getting ready for b/181888225 just in case
Reverted Changes:
I220551549:Attempt to run all java_test_host that look unit t...
I29dbbbf46:Exclude some tests for java_test_host onboarding
Change-Id: Iaa89f9b7e9ad72ed962cef285c70a6263e63ffd5
2021-03-04 21:08:36 +00:00
Lukács T. Berki
213810ca19
Merge "cd to / before running soong_build ." am: ddebd2c82a
am: db9632fbd0
am: 13dac96f2c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1609473
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1416378dec2959c10b37b6bea847bc2fd7c93027
2021-03-04 09:41:49 +00:00
Lukács T. Berki
13dac96f2c
Merge "cd to / before running soong_build ." am: ddebd2c82a
am: db9632fbd0
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1609473
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6fb83ce60ddefcfdff85db83c05a9fc45dc27a9c
2021-03-04 08:37:36 +00:00
Lukács T. Berki
ddebd2c82a
Merge "cd to / before running soong_build ."
2021-03-04 07:07:02 +00:00
Julien Desprez
a720801e91
Merge "Attempt to run all java_test_host that look unit tests" am: ce45b73070
am: e4e279ec9e
am: e2af725162
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1597083
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0b5dc4052af1ac5e0e4102483e7541eb0cf3f091
2021-03-04 05:27:29 +00:00
Julien Desprez
e2af725162
Merge "Attempt to run all java_test_host that look unit tests" am: ce45b73070
am: e4e279ec9e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1597083
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3d26cf98224741a15341c6ba09d1371c8ae1c838
2021-03-04 04:41:41 +00:00
Julien Desprez
ce45b73070
Merge "Attempt to run all java_test_host that look unit tests"
2021-03-04 02:00:58 +00:00
Lukacs T. Berki
7690c09953
cd to / before running soong_build .
...
This lets one avoid any decisions as to when to chdir there during its
execution and leads to better sandboxing because the pwd doesn't leak to
init() functions anymore.
Test: Manual.
Change-Id: I1560da8ed3a621249426f9e8908aa890c21e13ba
2021-03-03 09:14:22 +01:00
Ulyana Trafimovich
65253cd2ac
Merge "Do verify_uses_libraries check for APKs after patching library names." am: 97df5e65b0
am: e073aa2af2
am: d0f9821127
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1609481
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iba51b522daa4a85ac3875bc4c101edff174ee0cc
2021-03-03 00:23:35 +00:00
Ulyana Trafimovich
70de658eb1
Merge "Respect provides_uses_lib
for modules added via [optional_]uses_libs
" am: ae5cdfffa3
am: a9860b8a8f
am: 939809b6ce
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1609480
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4b3a08efc7c173054d0530777f17a7aa3e0dd8d7
2021-03-03 00:23:29 +00:00
Ulyana Trafimovich
d4186fdf61
Merge "Add provides_uses_library
example to TestUsesLibrary check." am: 71284b60ae
am: 5da4dcf21a
am: eaaa895ff1
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1609476
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I31c8cd697daac212739a60236bb5d63cdef5f85f
2021-03-03 00:23:24 +00:00
Ulyana Trafimovich
a6425c1adc
Merge "Stricten TestUsesLibrary check." am: 00c27b7a68
am: 45e3b00b56
am: 4b40d94a40
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1609474
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If7a22c6ddeb2a74c5ec157a21d5f2a1c4bda21b9
2021-03-03 00:23:18 +00:00
Ulyana Trafimovich
d0f9821127
Merge "Do verify_uses_libraries check for APKs after patching library names." am: 97df5e65b0
am: e073aa2af2
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1609481
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I100a6591ff3357d0129a090d0303cbf662766351
2021-03-02 23:25:17 +00:00
Ulyana Trafimovich
939809b6ce
Merge "Respect provides_uses_lib
for modules added via [optional_]uses_libs
" am: ae5cdfffa3
am: a9860b8a8f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1609480
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib5b3fe2b21b9b2186196e0b38a43cdf561f36a56
2021-03-02 23:24:52 +00:00
Ulyana Trafimovich
eaaa895ff1
Merge "Add provides_uses_library
example to TestUsesLibrary check." am: 71284b60ae
am: 5da4dcf21a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1609476
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0de2a9a5d645e85cea017271d6e06efa1cd28111
2021-03-02 23:24:46 +00:00
Ulyana Trafimovich
4b40d94a40
Merge "Stricten TestUsesLibrary check." am: 00c27b7a68
am: 45e3b00b56
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1609474
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I63c0525dc47669828727988067ba8f223e913992
2021-03-02 23:24:40 +00:00
Martin Stjernholm
bd49604486
Merge "Recognise the Google-signed ART APEXes as well." am: cfcaddc5b2
am: b85c77714a
am: cbe5663663
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1590194
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I69abcca03cf4a5935e10a46896c8dde1cba9a828
2021-03-02 20:39:08 +00:00
Martin Stjernholm
cbe5663663
Merge "Recognise the Google-signed ART APEXes as well." am: cfcaddc5b2
am: b85c77714a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1590194
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifa8f29e7a513ca4ee28b08727b496ead452b9e40
2021-03-02 19:49:59 +00:00
Ulyana Trafimovich
97df5e65b0
Merge "Do verify_uses_libraries check for APKs after patching library names."
2021-03-02 13:49:34 +00:00
Ulyana Trafimovich
ae5cdfffa3
Merge "Respect provides_uses_lib
for modules added via [optional_]uses_libs
"
2021-03-02 13:47:03 +00:00
Ulyana Trafimovich
71284b60ae
Merge "Add provides_uses_library
example to TestUsesLibrary check."
2021-03-02 13:46:49 +00:00
Ulyana Trafimovich
00c27b7a68
Merge "Stricten TestUsesLibrary check."
2021-03-02 13:46:19 +00:00
Martin Stjernholm
db5138230d
Recognise the Google-signed ART APEXes as well.
...
Test: `m nothing` in internal tree
Bug: 180325915
Change-Id: I83eb660ad7cb480fba2a7874ee7e7f9d35646871
2021-03-01 22:33:51 +00:00
Paul Duffin
271787bf29
Merge "Avoid hiddenapi ignoring prebuilt with missing dex implementation jar" am: c572b5bf62
am: 551d57c064
am: df806bcfca
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1609479
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If019e731a64cb80d19f72c51e07f3489c5e2008b
2021-03-01 20:50:17 +00:00
Paul Duffin
07e6744ac5
Merge "Allow java_sdk_library_import to contribute to hiddenapi processing" am: 69804ac388
am: 764a15f4e5
am: 08515806b9
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1609478
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic6bbf28746c7216a106a5ba66da944145ac5ab4b
2021-03-01 20:50:11 +00:00
Paul Duffin
09845d0105
Merge "Retrieve dex implementation jars from apex for java_sdk_library_import" am: 0a8d5248ef
am: b1426419ec
am: 86d8214509
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1609477
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I827dbe2b0fa2d6e70637c1087181a4d6422fbea5
2021-03-01 20:49:54 +00:00
Paul Duffin
df806bcfca
Merge "Avoid hiddenapi ignoring prebuilt with missing dex implementation jar" am: c572b5bf62
am: 551d57c064
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1609479
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I40d9a8d2ee00277bd1790bb80a8237020f3643ba
2021-03-01 20:10:01 +00:00
Paul Duffin
08515806b9
Merge "Allow java_sdk_library_import to contribute to hiddenapi processing" am: 69804ac388
am: 764a15f4e5
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1609478
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia22b20976de4b81e4e97026ceae4213309a28b5e
2021-03-01 20:09:21 +00:00
Paul Duffin
86d8214509
Merge "Retrieve dex implementation jars from apex for java_sdk_library_import" am: 0a8d5248ef
am: b1426419ec
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1609477
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0dc9e98b69c22ceb22d109ee412f59d3fb5e4819
2021-03-01 20:08:56 +00:00
Ulya Trafimovich
fe927a265e
Do verify_uses_libraries check for APKs after patching library names.
...
Some of the `uses_libs`/`optional_uses_libs` libraries may have a
library name that is different from the module name. In that case it is
necessary to patch these properties after `provides_uses_lib` for the
library is applied.
Bug: 132357300
Test: m nothing
Change-Id: I2e2248053787557f955a6b363c22e3bad0301ec7
2021-03-01 17:50:16 +00:00
Zhomart Mukhamejanov
cdb5b9a505
Merge "Add "ds-car-dev" to legacyCorePlatformApiModules." into sc-dev
2021-03-01 17:48:33 +00:00
Ulya Trafimovich
eea486a580
Respect provides_uses_lib
for modules added via [optional_]uses_libs
...
Previously `provides_uses_lib` property affected only those
<uses-library> dependencies that are automatically deduced by Soong as
implicit Java SDK libraries reachable from the `libs` property. Other
<uses-library> dependencies that are explicitly added in `uses_libs` and
`optional_uses_libs` properties ignored `provides_uses_lib`.
As TestUsesLibraries shows (see the TODOs), Soong behaviour is still
incorrect in two ways (to be addressed in follow-up CLs):
- `uses_libs`/`optional_uses_libs` are passed to manifest_fixer
- verify_uses_libraries check is based on `uses_libs`/
`optional_uses_libs`, and not on the CLC as it should be
Bug: 132357300
Test: m nothing
Change-Id: I0ec7aab9dcd44554d1a79ddd382491c562266fa3
2021-03-01 17:31:23 +00:00
Paul Duffin
c572b5bf62
Merge "Avoid hiddenapi ignoring prebuilt with missing dex implementation jar"
2021-03-01 17:04:53 +00:00
Paul Duffin
69804ac388
Merge "Allow java_sdk_library_import to contribute to hiddenapi processing"
2021-03-01 17:04:39 +00:00
Paul Duffin
0a8d5248ef
Merge "Retrieve dex implementation jars from apex for java_sdk_library_import"
2021-03-01 17:04:27 +00:00
Paul Duffin
ec0fe1775b
Avoid hiddenapi ignoring prebuilt with missing dex implementation jar
...
Previously, when a prebuilt was preferred but did not provide a
suitable boot dex jar both the source and the prebuilt were silently
ignored which meant that the "hiddenapi list" command was not given a
complete set of boot dex jars. That could either lead to incorrect
hiddenapi flags being set or the "hiddenapi list" command failing if it
could not find a class. Debugging the cause of either of those cases
can be very time consuming so this change fails early and makes the
cause very explicit.
Bug: 181267622
Test: m nothing
Change-Id: I6763ddb9ba90ed2e501d0cf7984f6655237e905d
2021-03-01 12:58:28 +00:00
Paul Duffin
3785673f9b
Allow java_sdk_library_import to contribute to hiddenapi processing
...
Invokes hiddenAPIExtractInformation() on the java_sdk_library_import's
dex implementation jar provided by the deapexer (on behalf of
prebuilt_apex) so that hiddenAPI can extract the information it needs,
if anything, from the dex file.
The dex file provided by deapexer has already had the hiddenapi
information encoded into it so it does not need to do that again.
Usually, it would require a classes implementation jar as well in
order to extract information from UnsupportedAppUsage annotations but
that is not available for a java_sdk_library_import. Fortunately, the
modules that are currently affected by this do not contain any such
annotations. This just uses a public api stubs jar instead.
Bug: 181267622
Test: m nothing
Change-Id: I96275e46f8b7fecba88075319e9f2da5ae315c03
2021-03-01 12:58:28 +00:00
Paul Duffin
3985351df6
Retrieve dex implementation jars from apex for java_sdk_library_import
...
Bug: 181267622
Test: m nothing
Change-Id: Idd6af2482f48bd3a05db88b8a06dbbbdee01ef78
2021-03-01 12:58:28 +00:00
Treehugger Robot
c4e73cc77d
Merge "Remove global state from sysprop libraries" am: 5e510d6271
am: 184957859b
am: 416eb1e44b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1611293
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2f9ed442d00dc0344e79e234c8b5b0994096d955
2021-03-01 10:15:38 +00:00
Treehugger Robot
416eb1e44b
Merge "Remove global state from sysprop libraries" am: 5e510d6271
am: 184957859b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1611293
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I10e6a378c6ef9cc1775b29e6d96c0aadc90a0ef1
2021-03-01 09:25:25 +00:00
Treehugger Robot
2dcfbcbccf
Merge "Propagate java resources in apps with no code" am: 2ee47272f5
am: f6316c4b1c
am: 5541754e5a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1610973
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic0bcc631c3927ef7cbfeaba4e44435eaf41f74c5
2021-03-01 09:00:18 +00:00
Treehugger Robot
5541754e5a
Merge "Propagate java resources in apps with no code" am: 2ee47272f5
am: f6316c4b1c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1610973
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic9f21c21508658da4cad91202315e3589b939c7f
2021-02-28 02:09:14 +00:00
Colin Cross
75ce9eccf3
Remove global state from sysprop libraries
...
Sysprop libraries use a global list to rewrite dependencies from
implementation libraries to public stub libraries when appropriate.
Remove the global list, and instead add a dependency from the
implementation to the public stub that forwards the JavaInfo.
Bug: 181367697
Test: sysprop_test.go
Change-Id: Ia7995feb3c079ca9bb6a403daaae3e3329fd7f6a
2021-02-26 16:28:12 -08:00
Colin Cross
b014f0787e
Propagate java resources in apps with no code
...
Use the java resources jar as the dex jar when building apps that
have no code.
Also remove maybeStrippedDexJar, the dex jar is never stripped now.
Fixes: 176305357
Test: TestAppJavaResources
Change-Id: Ic8b1165bd35d71237d307e7f5f895764e203a10d
2021-02-26 16:28:12 -08:00