Merge "Make android.test.mock use api_srcs instead of jarjar" am: 6fc7c62572 am: 851f8a23ea

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1900479

Change-Id: I1ab99f85091ab9665851afc633ee6e67314abe78

test-mock/Android.bp

@@ -27,9 +27,8 @@ package {
 
 java_sdk_library {
     name: "android.test.mock",
-
+    srcs: [":android-test-mock-sources"],
-    srcs: [
+    api_srcs: [
-        ":android-test-mock-sources",
         // Note: Below are NOT APIs of this library. We only take APIs under
         // the android.test.mock package. They however provide private APIs that
         // android.test.mock APIs references to. We need to have the classes in
@@ -44,15 +43,9 @@ java_sdk_library {
         "app-compat-annotations",
         "unsupportedappusage",
     ],
-
     api_packages: [
         "android.test.mock",
     ],
-    // Only include android.test.mock.* classes. Jarjar rules below removes
-    // classes in other packages like android.content. In order to keep the
-    // list up-to-date, permitted_packages ensures that the library contains
-    // clases under android.test.mock after the jarjar rules are applied.
-    jarjar_rules: "jarjar-rules.txt",
     permitted_packages: [
         "android.test.mock",
     ],

test-mock/jarjar-rules.txt

@@ -1,7 +0,0 @@
-zap android.accounts.**
-zap android.app.**
-zap android.content.**
-zap android.database.**
-zap android.os.**
-zap android.util.**
-zap android.view.**