Merge "Export some api files for use by cts/tests/signature tests" am: 0a45ac2928

am: b5d6cc540c

Change-Id: If5179d1403e99ac2008cfeb89046eb486263817c

4 files changed, 54 insertions, 2 deletions

diff --git a/Android.bp b/Android.bp
index af41e512ea15..c9c280403d54 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1247,6 +1247,24 @@ filegroup {
     ],
 }
 
+// Make the api/system-current.txt file available for use by modules in other
+// directories.
+filegroup {
+    name: "frameworks-base-api-system-current.txt",
+    srcs: [
+        "api/system-current.txt",
+    ],
+}
+
+// Make the api/system-removed.txt file available for use by modules in other
+// directories.
+filegroup {
+    name: "frameworks-base-api-system-removed.txt",
+    srcs: [
+        "api/system-removed.txt",
+    ],
+}
+
 framework_docs_only_args = " -android -manifest $(location core/res/AndroidManifest.xml) " +
     "-werror -lerror -hide 111 -hide 113 -hide 125 -hide 126 -hide 127 -hide 128 " +
     "-overview $(location core/java/overview.html) " +
diff --git a/test-base/Android.bp b/test-base/Android.bp
index 8aa0aaf363dd..69c296e7ee9c 100644
--- a/test-base/Android.bp
+++ b/test-base/Android.bp
@@ -25,7 +25,7 @@ java_sdk_library {
     srcs: ["src/**/*.java"],
 
     errorprone: {
-      javacflags: ["-Xep:DepAnn:ERROR"],
+        javacflags: ["-Xep:DepAnn:ERROR"],
     },
 
     hostdex: true,
@@ -96,3 +96,14 @@ java_library_static {
     ],
 }
 
+// Make the current.txt available for use by the cts/tests/signature tests.
+// ========================================================================
+filegroup {
+    name: "android-test-base-current.txt",
+    visibility: [
+        "//cts/tests/signature/api",
+    ],
+    srcs: [
+        "api/current.txt",
+    ],
+}
diff --git a/test-mock/Android.bp b/test-mock/Android.bp
index e1d6e01d6d06..a5cd1751151f 100644
--- a/test-mock/Android.bp
+++ b/test-mock/Android.bp
@@ -30,3 +30,15 @@ java_sdk_library {
     srcs_lib_whitelist_pkgs: ["android"],
     compile_dex: true,
 }
+
+// Make the current.txt available for use by the cts/tests/signature tests.
+// ========================================================================
+filegroup {
+    name: "android-test-mock-current.txt",
+    visibility: [
+        "//cts/tests/signature/api",
+    ],
+    srcs: [
+        "api/current.txt",
+    ],
+}
diff --git a/test-runner/Android.bp b/test-runner/Android.bp
index 35212020be7b..75f5b5a96eb1 100644
--- a/test-runner/Android.bp
+++ b/test-runner/Android.bp
@@ -40,7 +40,7 @@ java_sdk_library {
         "junit.textui",
     ],
 
-    compile_dex: true
+    compile_dex: true,
 }
 
 // Build the android.test.runner-minus-junit library
@@ -86,3 +86,14 @@ java_library_static {
     java_version: "1.8",
 }
 
+// Make the current.txt available for use by the cts/tests/signature tests.
+// ========================================================================
+filegroup {
+    name: "android-test-runner-current.txt",
+    visibility: [
+        "//cts/tests/signature/api",
+    ],
+    srcs: [
+        "api/current.txt",
+    ],
+}