Remove *nonpublic_deps which was added pre-Rb announcement.
Bug: 221855066
21090328
Test: build
mmm -j packages/modules/Auxiliary
mmm -j packages/modules/SupplementalApi
Change-Id: If84b882f8bdaee62cfb107c6a079fbc55a012876
diff --git a/StubLibraries.bp b/StubLibraries.bp
index 94f4374..fef95e8 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -23,14 +23,6 @@
// and comparing them against the checked in API signature, and also checking compatibility
// with the latest frozen API signature.
-// TODO(b/21090328): Remove filter after we are ready to.
-soong_config_module_type_import {
- from: "frameworks/base/Android.bp",
- module_types: [
- "java_library_with_nonpublic_deps",
- ],
-}
-
/////////////////////////////////////////////////////////////////////
// These modules provide source files for the stub libraries
/////////////////////////////////////////////////////////////////////
@@ -232,7 +224,7 @@
visibility: ["//visibility:private"],
}
-java_library_with_nonpublic_deps {
+java_library {
name: "android-non-updatable.stubs",
defaults: ["android-non-updatable_defaults_stubs_current"],
srcs: [":api-stubs-docs-non-updatable"],
@@ -242,7 +234,7 @@
},
}
-java_library_with_nonpublic_deps {
+java_library {
name: "android-non-updatable.stubs.system",
defaults: ["android-non-updatable_defaults_stubs_current"],
srcs: [":system-api-stubs-docs-non-updatable"],
@@ -270,7 +262,7 @@
},
}
-java_library_with_nonpublic_deps {
+java_library {
name: "android-non-updatable.stubs.test",
defaults: ["android-non-updatable_defaults_stubs_current"],
srcs: [":test-api-stubs-docs-non-updatable"],
@@ -290,7 +282,7 @@
defaults_visibility: ["//frameworks/base/services"],
}
-java_library_with_nonpublic_deps {
+java_library {
name: "android_stubs_current",
static_libs: [
"all-modules-public-stubs",
@@ -300,7 +292,7 @@
defaults: ["android.jar_defaults"],
}
-java_library_with_nonpublic_deps {
+java_library {
name: "android_system_stubs_current",
static_libs: [
"all-modules-system-stubs",
@@ -324,7 +316,7 @@
],
}
-java_library_with_nonpublic_deps {
+java_library {
name: "android_test_stubs_current",
// Modules do not have test APIs, but we want to include their SystemApis, like we include
// the SystemApi of framework-non-updatable-sources.