From 1d53c8c98676bd014220e5cb55fbf6df7f83018e Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Tue, 17 Dec 2019 18:34:59 +0000
Subject: [PATCH] Cleanup framework-all usage

It generally shouldn't be depended on. Only by droidstubs for
modules.

Bug: 137191822
Bug: 149906971
Test: m
Change-Id: I16e672aaae80d8bcce25e46c34984797740aae1b
Merged-In: I16e672aaae80d8bcce25e46c34984797740aae1b
(cherry picked from commit 6fb18bbfdb99d9a21c499611d87d09f4988c00f2)
---
 services/Android.bp  | 3 ---
 test-mock/Android.bp | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/services/Android.bp b/services/Android.bp
index bca34f55fddd0..5019bb173cd5b 100644
--- 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: {
diff --git a/test-mock/Android.bp b/test-mock/Android.bp
index 616b6b005f89f..248c117d2e03a 100644
--- 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",
     ],