Merge "Cleanup framework-all usage"
diff --git a/services/Android.bp b/services/Android.bp
index 8376d2b..8be6e16 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -117,9 +117,6 @@
" --hide ReferencesHidden" +
" --hide DeprecationMismatch" +
" --hide HiddenTypedefConstant",
- libs: [
- "framework-all",
- ],
visibility: ["//visibility:private"],
}
diff --git a/test-mock/Android.bp b/test-mock/Android.bp
index 616b6b0..248c117 100644
--- a/test-mock/Android.bp
+++ b/test-mock/Android.bp
@@ -28,7 +28,7 @@
":framework_native_aidl",
],
libs: [
- "framework-all",
+ "framework",
"app-compat-annotations",
"unsupportedappusage",
],