Merge "Cleanup framework-all usage" am: 38ca6040ea am: 5c7bc2062f

Change-Id: Ib57d4f63cb10e015cf474b05c02f7bdddc3ba1f0
2020-02-21 11:31:14 +00:00
parent 11c3205f05 5c7bc2062f
commit 9c0f621c9d
2 changed files with 1 additions and 4 deletions
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -118,9 +118,6 @@ droidstubs {
        " --hide ReferencesHidden" +
        " --hide DeprecationMismatch" +
        " --hide HiddenTypedefConstant",
-    libs: [
-        "framework-all",
-    ],
    visibility: ["//visibility:private"],
    check_api: {
        current: {
--- a/test-mock/Android.bp
+++ b/test-mock/Android.bp
@@ -28,7 +28,7 @@ java_sdk_library {
        ":framework_native_aidl",
    ],
    libs: [
-        "framework-all",
+        "framework",
        "app-compat-annotations",
        "unsupportedappusage",
    ],