From 79242c2d2d902096dc5b81537c330ab20d25637e Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Mon, 9 Dec 2019 14:45:07 +0900 Subject: [PATCH] framework is not available to APEXes The modules 'framework', 'framework-minus-apex', 'framework-all' contain private symbols that shouldn't be accessible to Mainline modules. Restrict the access by making the framework modules to be accessible only to the platform (the non updatable part). Bug: 145796956 Test: m Merged-In: I08cb61a67aef88ffe04ef52670144e1cbeff3cf9 Change-Id: I08cb61a67aef88ffe04ef52670144e1cbeff3cf9 --- Android.bp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Android.bp b/Android.bp index 7d95b9a1b1fb..81dd16024459 100644 --- a/Android.bp +++ b/Android.bp @@ -442,6 +442,7 @@ java_library { ], // For backwards compatibility. stem: "framework", + apex_available: ["//apex_available:platform"], } // This "framework" module is NOT installed to the device. It's @@ -463,6 +464,7 @@ java_library { // TODO(jiyong): add more stubs for APEXes here ], sdk_version: "core_platform", + apex_available: ["//apex_available:platform"], } java_library { @@ -470,6 +472,7 @@ java_library { defaults: ["framework-defaults"], srcs: [":framework-all-sources"], installable: false, + apex_available: ["//apex_available:platform"], } java_library {