Merge "Export some api files for use by cts/tests/signature tests" am: 0a45ac2928 am: b5d6cc540c
am: 48cce27632
Change-Id: Ia3c78e871e5dcaf574cbfc5aced75a6beca2fa3b
diff --git a/Android.bp b/Android.bp
index af41e51..c9c2804 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1247,6 +1247,24 @@
],
}
+// 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 8aa0aaf..69c296e 100644
--- a/test-base/Android.bp
+++ b/test-base/Android.bp
@@ -25,7 +25,7 @@
srcs: ["src/**/*.java"],
errorprone: {
- javacflags: ["-Xep:DepAnn:ERROR"],
+ javacflags: ["-Xep:DepAnn:ERROR"],
},
hostdex: true,
@@ -96,3 +96,14 @@
],
}
+// 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 e1d6e01..a5cd175 100644
--- a/test-mock/Android.bp
+++ b/test-mock/Android.bp
@@ -30,3 +30,15 @@
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 3521202..75f5b5a 100644
--- a/test-runner/Android.bp
+++ b/test-runner/Android.bp
@@ -40,7 +40,7 @@
"junit.textui",
],
- compile_dex: true
+ compile_dex: true,
}
// Build the android.test.runner-minus-junit library
@@ -86,3 +86,14 @@
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",
+ ],
+}