diff options
| author | Paul Duffin <paulduffin@google.com> | 2019-03-01 09:04:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-03-01 09:04:39 +0000 |
| commit | e28d0c0ff30e26f24671c90f36a02be80c87443e (patch) | |
| tree | 23905b06ed4e1ac80437a47699fc9c4696b5b0df /java/hiddenapi_singleton.go | |
| parent | f8711f053c2c1d07aa6e42fb3a85177dd39fbbef (diff) | |
| parent | 719fed4e950c494ce3190d3162050b6d5c4b69ed (diff) | |
| download | android_build_soong-e28d0c0ff30e26f24671c90f36a02be80c87443e.tar.gz android_build_soong-e28d0c0ff30e26f24671c90f36a02be80c87443e.tar.bz2 android_build_soong-e28d0c0ff30e26f24671c90f36a02be80c87443e.zip | |
Merge changes Ib0389900,Ib2d69dea
* changes:
Fix hiddenapi issue when REMOVE_ATB_FROM_BCP=true
Improve hiddenapi processing so it does not require white list
Diffstat (limited to 'java/hiddenapi_singleton.go')
| -rw-r--r-- | java/hiddenapi_singleton.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/java/hiddenapi_singleton.go b/java/hiddenapi_singleton.go index 23f6cb0e..ceafb59e 100644 --- a/java/hiddenapi_singleton.go +++ b/java/hiddenapi_singleton.go @@ -89,7 +89,13 @@ func stubFlagsRule(ctx android.SingletonContext) { // Public API stubs publicStubModules := []string{ "android_stubs_current", - "android.test.base.stubs", + } + + // Add the android.test.base to the set of stubs only if the android.test.base module is on + // the boot jars list as the runtime will only enforce hiddenapi access against modules on + // that list. + if inList("android.test.base", ctx.Config().BootJars()) { + publicStubModules = append(publicStubModules, "android.test.base.stubs") } // System API stubs |