Commit graph

20146 commits

Author SHA1 Message Date
Treehugger Robot
bd7f948507 Merge "Notice file embededd in APEX is deterministic" am: 9980c6e111
Change-Id: I25651a62edfcfc111af3591433e2f525b168158e
2020-05-30 08:12:24 +00:00
Treehugger Robot
9980c6e111 Merge "Notice file embededd in APEX is deterministic" 2020-05-30 07:54:31 +00:00
Ulyana Trafimovich
8eb051e918 Merge "Don't use obsolete "org.apache.http.legacy.impl" in class loader context." am: 7c9db5d13f
Change-Id: I850b040c92fb063c0f78feeabc5156e703643582
2020-05-29 21:43:25 +00:00
Anton Hansson
67c96391f6 Merge "Revert "Fix missing headers of vendor snapshot"" am: ae9170cdd0
Change-Id: Iec1b1e87e7c56020e063cee826c5d870fbc69684
2020-05-29 21:39:31 +00:00
Ulyana Trafimovich
7c9db5d13f Merge "Don't use obsolete "org.apache.http.legacy.impl" in class loader context." 2020-05-29 17:14:46 +00:00
Ivan Lozano
b780886a06 Merge "Fix darwin shared library and proc macro suffixes." am: a8450fd2be
Change-Id: If83470ca15fb0e4469d41d614ca4bb917bbf5b27
2020-05-29 16:44:43 +00:00
Anton Hansson
ae9170cdd0 Merge "Revert "Fix missing headers of vendor snapshot"" 2020-05-29 16:18:08 +00:00
Anton Hansson
0fcdd53e10 Revert "Fix missing headers of vendor snapshot"
This reverts commit b6a586241e.

Reason for revert: b/157737963

Change-Id: Ic72e14ba2d8c3bfbc61906bf668a3e56619f04a4
2020-05-29 16:11:19 +00:00
Ulya Trafimovich
df00ddecb6 Don't use obsolete "org.apache.http.legacy.impl" in class loader context.
This library no longer exists on device and "org.apache.http.legacy"
should be used instead. The error lingered in the code for a while
because the code was not exercised at all. (The only app that sets
EnforceUsesLibraries is GoogleDialer (not in AOSP), and it specifies
"org.apache.http.legacy" explicitly as an optional used library.)

Test: lunch aosp_cf_x86_phone-userdebug && m
Change-Id: I05fa115476315d35a8877fc42bd1c2042f72f2de
2020-05-29 15:00:30 +01:00
Ivan Lozano
a8450fd2be Merge "Fix darwin shared library and proc macro suffixes." 2020-05-29 13:44:13 +00:00
Paul Duffin
a9c49f5f97 Collect permitted packages from java_sdk_library instances am: e739f1ed9f
Change-Id: I7178f6fcd6e017cd7b00929eed61b5f3a51888f6
2020-05-29 13:40:29 +00:00
Paul Duffin
36c5664a30 Merge "Fix prebuilt test on mac" am: 75ab309e33
Change-Id: I99136df04fe8ca2f15bf516c006ddd32b9ae4536
2020-05-29 13:40:24 +00:00
Inseob Kim
e4f0a009a0 Merge "Fix missing headers of vendor snapshot" am: 705e6e8ce9
Change-Id: I4e0e34d218f6b739b65e020106ce02c2615f75f8
2020-05-29 13:40:17 +00:00
Treehugger Robot
99deb0858e Merge "Ensure package check is run for java_library in APEX" am: b719d60d20
Change-Id: Icb95b6cb68b370bb571eae951c1e124c15e1f223
2020-05-29 13:40:11 +00:00
Yo Chiang
6a63341a93 Merge "Add symlinks support for prebuilt_etc modules" am: cb240bc9c1
Change-Id: Id69bc8b2fcaf0b9c2c48919054256eefcf7a7e31
2020-05-29 13:40:05 +00:00
Kousik Kumar
d996ff6a68 Merge "Add support for remote-execution / caching of jar/zip actions" am: c4cdba07d3
Change-Id: If86f8d80e00c881f79177990cc34cc40f7ba1c58
2020-05-29 13:39:58 +00:00
Treehugger Robot
460b1abf4e Merge "java_sdk_library: Propagate shared_library to snapshot" am: ad43500655
Change-Id: I7ecb6160d3becdda66ee5a8bef21774c73ebdf49
2020-05-29 13:39:51 +00:00
Ivan Lozano
c0ccb6b443 Fix darwin shared library and proc macro suffixes.
Darwin builds aren't using the correct suffix for shared libraries or
proc macros (.dylib). This fixes that.

Bug: 155302034
Test: "cd external/rust; mma" no longer indicates wrong extension.
Change-Id: I5093e0bcc78dbb2dd9fcf39069f326101bb8f411
2020-05-29 13:08:27 +00:00
Jiyong Park
33c7736936 Notice file embededd in APEX is deterministic
Bug: 157724521
Test: m
Change-Id: I25f6cd9dd0679af6acfc2594314d11fa53ae2151
2020-05-29 22:00:16 +09:00
Paul Duffin
e739f1ed9f Collect permitted packages from java_sdk_library instances
Switching an updatable boot jar from java_library to java_sdk_library
changed the contents of the updatable-bcp-packages.txt due to the code
requiring the module to be *Library. This change updates that to allow
it to be any module that implements the
PermittedPackagesForUpdatableBootJars interface which is *Library and
anything that embeds that like *SdkLibrary.

Bug: 155164730
Test: m droid and check the contents of system/etc/updatable-bcp-packages.txt
Change-Id: I464af74628da311734f102f77ec8158daec5b32d
2020-05-29 12:31:41 +01:00
Paul Duffin
75ab309e33 Merge "Fix prebuilt test on mac" 2020-05-29 07:31:28 +00:00
Inseob Kim
705e6e8ce9 Merge "Fix missing headers of vendor snapshot" 2020-05-29 07:24:02 +00:00
Paul Duffin
69304cf655 Fix prebuilt test on mac
Bug: 157707511
Test: m nothing
Change-Id: I350fe00040e0c8be8e4fa625798c3c7653d72037
2020-05-29 08:01:00 +01:00
Treehugger Robot
b719d60d20 Merge "Ensure package check is run for java_library in APEX" 2020-05-29 06:53:46 +00:00
Yo Chiang
cb240bc9c1 Merge "Add symlinks support for prebuilt_etc modules" 2020-05-29 06:36:19 +00:00
Kousik Kumar
c4cdba07d3 Merge "Add support for remote-execution / caching of jar/zip actions" 2020-05-29 03:31:20 +00:00
Treehugger Robot
ad43500655 Merge "java_sdk_library: Propagate shared_library to snapshot" 2020-05-29 02:06:54 +00:00
Treehugger Robot
3013ea064f Merge "apex respects stem of java_library modules" am: 00f5701ade
Change-Id: I6b6ebf0dbfe5c0ff6a63339bc1c8180b1aa89fcd
2020-05-29 00:56:45 +00:00
Treehugger Robot
00f5701ade Merge "apex respects stem of java_library modules" 2020-05-29 00:45:03 +00:00
Martin Stjernholm
45f0028d13 Merge "Fall back to the source module for variants that the corresponding prebuilt doesn't define." am: 1b2bae1ba5
Change-Id: Ia11705c1d6f28bb85e014f56765aea1d6c7ce326
2020-05-28 20:25:05 +00:00
Martin Stjernholm
1b2bae1ba5 Merge "Fall back to the source module for variants that the corresponding prebuilt doesn't define." 2020-05-28 20:09:44 +00:00
Kousik Kumar
366afc5011 Add support for remote-execution / caching of jar/zip actions
Test: Ran a build with `RBE_JAR="true" RBE_JAR_EXEC_STRATEGY="remote"
RBE_ZIP="true" RBE_ZIP_EXEC_STRATEGY="remote" ... use_rbe m` and that
succeeded.

Bug: b/156765207
Change-Id: Ia17b532fbb282be414adf879914870082dd0841b
2020-05-28 11:56:48 -07:00
Kousik Kumar
f52d6420ea Merge "Add support for remote-execution / caching of signapk actions" am: 8f37ec82d9
Change-Id: I35bc6a092e26924e8ef8b5e5c04da313bbca9146
2020-05-28 18:51:39 +00:00
Kousik Kumar
8f37ec82d9 Merge "Add support for remote-execution / caching of signapk actions" 2020-05-28 18:31:31 +00:00
Liz Kammer
aa5f42c3c4 Merge "Only include test data in flattened apex 1 time" am: 25aeb7d19b
Change-Id: I499773bc30f71891e73851aa9331abde6e05fb45
2020-05-28 17:18:24 +00:00
Liz Kammer
25aeb7d19b Merge "Only include test data in flattened apex 1 time" 2020-05-28 16:57:39 +00:00
Paul Duffin
d7eb1c2a76 java_sdk_library: Propagate shared_library to snapshot
Passes the shared_library property through to the snapshot. It does not
optimize away the default value in order to make it easier to invert
the default value in future. The current default value was only chosen
for convenience because most existing usages were already treated as
shared libraries. It would be safer if modules had to opt in to be used
as shared libraries.

Bug: 155164730
Test: m nothing
Change-Id: I33c7323f2389b44ed49cebe517ae2cce349117f1
2020-05-28 17:39:25 +01:00
Jiyong Park
a62aa23990 apex respects stem of java_library modules
apex now respects stem of java_library modules.

As a follow-up we need to suppor the same for other types of modules.

Bug: 157638999
Test: m
Change-Id: Iaf5023020b5440f1ffd4f5414b5a7864655fc22a
2020-05-28 23:48:16 +09:00
Paul Duffin
63d8febd35 Ensure package check is run for java_library in APEX
Package checks were not being run for java libraries that were in an
APEX and not on the platform. This change fixes that and updates the
script to report all failing classes to make it easier to update the
list of packages.

Test: m java
Bug: 157633658
Change-Id: I28044e08d3a40e9f3464bb2158ef6a28d57264d1
2020-05-28 15:06:35 +01:00
Kousik Kumar
309b1c0da3 Add support for remote-execution / caching of signapk actions
Test: "RBE_SIGNAPK=true RBE_SIGNAPK_EXEC_STRATEGY=remote ... use_rbe m" on crosshatch-userdebug and
signapk targets worked
Bug: b/156765091

Change-Id: I4b8c21320c2f38914ef39d3d8f036d885fab4e72
2020-05-28 06:14:56 -07:00
Martin Stjernholm
009a9dc4ac Fall back to the source module for variants that the corresponding
prebuilt doesn't define.

Test: m
Test: "m" on a platform tree with prebuilts/runtime in the manifest
Bug: 151303681
Change-Id: I8e10579c5daa79e82009a0c3060cde76cdf520e9
2020-05-28 13:17:21 +01:00
Treehugger Robot
03d606be88 Merge "Add default_to_stubs option to java_sdk_library" am: f455d1fb0a
Change-Id: Ie143f088fef37d3a29e230fde1de56f2e847b0f0
2020-05-28 11:29:14 +00:00
Treehugger Robot
f455d1fb0a Merge "Add default_to_stubs option to java_sdk_library" 2020-05-28 11:09:31 +00:00
Jooyung Han
92e904f5e7 Merge "pom2bp: add apex_available/min_sdk_version" am: 9a37d4a602
Change-Id: I7813865c7bfa067dbdcaecaa7bb3ba4e6ca4dbc2
2020-05-28 09:23:26 +00:00
Jooyung Han
9a37d4a602 Merge "pom2bp: add apex_available/min_sdk_version" 2020-05-28 09:09:59 +00:00
Jiyong Park
932cdfeb06 Add default_to_stubs option to java_sdk_library
Previously, when a lib that doesn't have sdk_version property set
depends on a java_sdk_library, the impl library was used for linking.
This might be too permissive because the client lib might be using empty
sdk_version because it needed some private APIs from the platform, but
not from the java_sdk_library. This actually happend for some of the CTS
tests. They don't set sdk_version, but were directly depending on
android.test.[base|runner|mock].stubs libraries. If we switch the
references to the stub libraries into the corresponding java_sdk_library
modules (e.g. aandroid.test.[base|runner|mock]), then we would be
allowing private APIs to the CTS tests, which is not good.

To solve this problem, default_to_stub property is introduced. It when set
to true prevents the impl lib from being used for linking. When a module
that doesn't have sdk_version depends on it, the widest API surface that
the java_sdk_library provides is linked instead.

Bug: 157007292
Test: m
Change-Id: Id2acc3cafb71d1e90d4fdc9c0c70a73983355e0f
2020-05-28 18:07:06 +09:00
Jiyong Park
afac912800 Remove apex_available whitelist for the ART APEX am: b51e7ea3b8
Change-Id: I705d3d8e036f008ab0d74c776299b96f7a90ba9e
2020-05-28 06:26:55 +00:00
Jiyong Park
b51e7ea3b8 Remove apex_available whitelist for the ART APEX
The marked library(ies) were available to the APEX via the
hand-written whitelist in build/soong/apex/apex.go. Trying to remove the
whitelist by adding apex_available property to the Android.bp of the
libraries.

Exempt-From-Owner-Approval: cherry-pick from internal

Bug: 150999716
Test: m
Merged-In: I2b792657b444f0c963e1e92b7c91f6a0cfe1688c
(cherry picked from commit be6e2b6a18)
Change-Id: I2b792657b444f0c963e1e92b7c91f6a0cfe1688c
2020-05-28 04:06:41 +00:00
Inseob Kim
b6a586241e Fix missing headers of vendor snapshot
Changing of installable function has broken vendor snapshot's header
libraries. Fixing it and adding tests to prevent further breakage.

Bug: 157106227
Test: m vendor-snapshot captures header libraries
Change-Id: I8b581c1b2186ca2db85ae408e959c20bbd034db6
2020-05-28 01:10:06 +00:00
Treehugger Robot
21f6c3b54e Merge "Explain checkLinker errors a bit more." am: bd371b6533
Change-Id: I4a91ca0234afc510c84f5da1b871731c1208af92
2020-05-27 23:39:03 +00:00