Commit Graph

22741 Commits

Author SHA1 Message Date
Inseob Kim
8d3b712ae0 Merge "Fix missing headers of vendor snapshot" am: 705e6e8ce9 am: e4f0a009a0
Change-Id: I6aca5aaa25ed643b2a56cbf719d803555b427ce3
2020-05-29 13:57:18 +00:00
Treehugger Robot
77060be6c7 Merge "Ensure package check is run for java_library in APEX" am: b719d60d20 am: 99deb0858e
Change-Id: I5fb6f77f6146b1c06121caac5efee392dc90da16
2020-05-29 13:57:10 +00:00
Yo Chiang
da0ce643af Merge "Add symlinks support for prebuilt_etc modules" am: cb240bc9c1 am: 6a63341a93
Change-Id: If9bfe3e9b4df1f10b4075f9ed48e603264d378a8
2020-05-29 13:57:04 +00:00
Kousik Kumar
2b6185810a Merge "Add support for remote-execution / caching of jar/zip actions" am: c4cdba07d3 am: d996ff6a68
Change-Id: I41f544531788cfdf7a16560e24f27c9d31b186ad
2020-05-29 13:56:58 +00:00
Treehugger Robot
fbdd5e74e7 Merge "java_sdk_library: Propagate shared_library to snapshot" am: ad43500655 am: 460b1abf4e
Change-Id: I0513782b61ffb1de7b54c29dcab61a9ec513aa2b
2020-05-29 13:56:51 +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
TreeHugger Robot
e3a5ad660d Merge "Collect permitted packages from java_sdk_library instances" into rvc-dev am: 5cfbb4332f
Change-Id: I3d5a7d6de21cfc988f146caef84ae1b8b1fd2a33
2020-05-29 13:32:49 +00:00
TreeHugger Robot
5cfbb4332f Merge "Collect permitted packages from java_sdk_library instances" into rvc-dev 2020-05-29 13:18:05 +00:00
TreeHugger Robot
7bda45c615 Merge "Ensure package check is run for java_library in APEX" into rvc-dev am: 484129dfb9
Change-Id: I7a4efa288fb419a8a04c01c6b3c64b5a172dd255
2020-05-29 11:54:58 +00:00
TreeHugger Robot
484129dfb9 Merge "Ensure package check is run for java_library in APEX" into rvc-dev 2020-05-29 11:40:19 +00:00
Paul Duffin
a105cf99d0 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:35:18 +01:00
Orion Hodson
6c27abd294 Merge "Add some app modules to the allowed whitelist." into rvc-dev-plus-aosp 2020-05-29 11:16:40 +00:00
Dan Albert
555760552b Add some app modules to the allowed whitelist.
Test: treehugger
Bug: 152482542
Change-Id: Ia7adf690cd6dca1408ae0a340860eaeae6c1d4b4
Merged-In: Ia7adf690cd6dca1408ae0a340860eaeae6c1d4b4
(cherry picked from commit 6b6d387a75)
Exempt-From-Owner-Approval: already +2'ed by owner
2020-05-29 11:08:38 +00:00
Jooyung Han
0441ceb569 Merge changes from topic "apk-jni-enforce" into rvc-dev am: de58c39bd6
Change-Id: Ib163e2407527c33c773179f1109b705c4f5202e5
2020-05-29 10:48:21 +00:00
Jooyung Han
5bac03f31c [automerger skipped] Reland "enforce sdk_version for JNI libs for updatable APKs" am: af7f91fc9d -s ours
am skip reason: Change-Id I08543ccee7dfda0559a1fca108ceb5c28f84943f with SHA-1 bbc3fb780b is in history

Change-Id: I38070a6373b75de80f7079d6d095469d795bc5b5
2020-05-29 10:48:18 +00:00
Jooyung Han
de58c39bd6 Merge changes from topic "apk-jni-enforce" into rvc-dev
* changes:
  Use sdkSpec to compare sdk_versions of APK/JNI
  Reland "enforce sdk_version for JNI libs for updatable APKs"
2020-05-29 10:33:59 +00:00
Paul Duffin
fa5b73bcb6 java_sdk_library: Propagate shared_library to snapshot am: a84756c827
Change-Id: Ibb843f87f8c3a93743fac6c6658f8fca7be44a56
2020-05-29 10:16:46 +00:00
Jiyong Park
d023ce9a28 [automerger skipped] Add default_to_stubs option to java_sdk_library am: 27fc414b84 -s ours
am skip reason: Change-Id Id2acc3cafb71d1e90d4fdc9c0c70a73983355e0f with SHA-1 932cdfeb06 is in history

Change-Id: Ic5e4bb98acde0b972f0700d80e54400f4e6f8c00
2020-05-29 09:51:12 +00:00
Paul Duffin
c552427032 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
(cherry picked from commit 63d8febd35)
2020-05-29 09:18:13 +01:00
Paul Duffin
a84756c827 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
Merged-In: I33c7323f2389b44ed49cebe517ae2cce349117f1
Change-Id: I33c7323f2389b44ed49cebe517ae2cce349117f1
(cherry picked from commit d7eb1c2a76)
2020-05-29 09:16:11 +01:00
Jiyong Park
27fc414b84 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
Merged-In: Id2acc3cafb71d1e90d4fdc9c0c70a73983355e0f
Change-Id: Id2acc3cafb71d1e90d4fdc9c0c70a73983355e0f
(cherry picked from commit 932cdfeb06)
2020-05-29 09:15:09 +01:00
Jiyong Park
cf464be35d [automerger skipped] apex respects stem of java_library modules am: ed50ca8dd8 -s ours
am skip reason: Change-Id Iaf5023020b5440f1ffd4f5414b5a7864655fc22a with SHA-1 a62aa23990 is in history

Change-Id: I8e8a57f564f7fde2e229680af5c27de7a5041d3b
2020-05-29 07:24:48 +00:00
Inseob Kim
705e6e8ce9 Merge "Fix missing headers of vendor snapshot" 2020-05-29 07:24:02 +00: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
Jiyong Park
ed50ca8dd8 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.

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

Bug: 157638999
Test: m
Merged-In: Iaf5023020b5440f1ffd4f5414b5a7864655fc22a
(cherry picked from commit a62aa23990)
Change-Id: Iaf5023020b5440f1ffd4f5414b5a7864655fc22a
2020-05-29 14:15:36 +09: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
db1bd15ef0 Merge "apex respects stem of java_library modules" am: 00f5701ade am: 3013ea064f
Change-Id: I40a1a6803d8af53a7889b8986f59fbafd4d13ee1
2020-05-29 01:17:33 +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
Jooyung Han
9d2c0f7af2 Use sdkSpec to compare sdk_versions of APK/JNI
"current" is converted to int differently if we use
sdkSpec.effectiveVersion for APK and android.ApiStrToNum for JNI.
For example, in REL branch, "current" is equiv to PlatformSdkVersion
for APK, but 10000(FutureApiVersion) for JNI.

Use sdkSpec.effectiveVersion to compare APK.min_sdk_version and
JNI.sdk_version.

Bug: 145796956
Test: m
Change-Id: I2c4dbb79ae8712004dc3a9e647aa53cd5de7b508
2020-05-28 23:08:04 +00:00
Jooyung Han
af7f91fc9d Reland "enforce sdk_version for JNI libs for updatable APKs"
JNI libs for "updatable" APKs or APKs in "updatable" APEXes should set
sdk_version which is equal to or less than APK's min_sdk_version.

In fact, we'd better check if min_sdk_version of JNI libs matches(or is
earlier than) min_sdk_version of the APK. But for now the build system
can't handle sdk_version/min_sdk_version correctly for JNI libs. That's
why sdk_version of JNI libs is enforced to match with min_sdk_version
of APK in this change.

(original commit: 98c4750f39)

Bug: 145796956
Test: m
Merged-In: I08543ccee7dfda0559a1fca108ceb5c28f84943f
Change-Id: I08543ccee7dfda0559a1fca108ceb5c28f84943f
(cherry picked from commit bbc3fb780b)
2020-05-28 23:06:52 +00:00
Martin Stjernholm
b9243e921f Merge "Fall back to the source module for variants that the corresponding prebuilt doesn't define." am: 1b2bae1ba5 am: 45f0028d13
Change-Id: Iccd954c014135ecd1a6e38f44cc5d943b39992fb
2020-05-28 20:43:49 +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
0f5e5c724e Merge "Add support for remote-execution / caching of signapk actions" am: 8f37ec82d9 am: f52d6420ea
Change-Id: I3c51e0ff23903ba101d2029a632f99fc8342c2d9
2020-05-28 19:06:40 +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
1de62786c3 Merge "Only include test data in flattened apex 1 time" am: 25aeb7d19b am: aa5f42c3c4
Change-Id: Ia0ebe0e45a2f0fa7f3620313f94cd0835d2c8468
2020-05-28 17:33:00 +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