Revert "Define core-current-stubs-for-system-modules-exportable"
Revert submission 3316190-core_system_module_exportable
Reason for revert:DroidMonitor: Potential culprit for http://b/375006938 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
Reverted changes: /q/submissionid:3316190-core_system_module_exportable
Change-Id: Ia576b4281a57e1236839429169e1d8db897527f5
diff --git a/java/core-libraries/Android.bp b/java/core-libraries/Android.bp
index 8c808e4..da86540 100644
--- a/java/core-libraries/Android.bp
+++ b/java/core-libraries/Android.bp
@@ -132,10 +132,10 @@
// prebuilts/sdk/update_prebuilts.py script to update the prebuilts/sdk
// directory.
java_library {
- name: "core-current-stubs-for-system-modules-exportable",
+ name: "core-current-stubs-for-system-modules",
visibility: ["//development/sdk"],
static_libs: [
- "core.current.stubs.exportable",
+ "core.current.stubs",
// This one is not on device but it's needed when javac compiles code
// containing lambdas.
"core-lambda-stubs-for-system-modules",
@@ -155,19 +155,6 @@
],
}
-java_library {
- name: "core-current-stubs-for-system-modules",
- visibility: ["//development/sdk"],
- static_libs: [
- "core.current.stubs",
- // This one is not on device but it's needed when javac compiles code
- // containing lambdas.
- "core-lambda-stubs-for-system-modules",
- ],
- sdk_version: "none",
- system_modules: "none",
-}
-
// Defaults module to strip out android annotations
java_defaults {
name: "system-modules-no-annotations",