diff options
| -rw-r--r-- | StubLibraries.bp | 76 |
1 files changed, 35 insertions, 41 deletions
diff --git a/StubLibraries.bp b/StubLibraries.bp index 1644a550aca5..ba9c250f2975 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -268,6 +268,36 @@ droidstubs { // from stub sources ///////////////////////////////////////////////////////////////////// +modules_public_stubs = [ + "android.net.ipsec.ike.stubs", + "art.module.public.api.stubs", + "conscrypt.module.public.api.stubs", + "framework-connectivity.stubs", + "framework-media.stubs", + "framework-mediaprovider.stubs", + "framework-permission.stubs", + "framework-sdkextensions.stubs", + "framework-statsd.stubs", + "framework-tethering.stubs", + "framework-wifi.stubs", + "i18n.module.public.api.stubs", +] + +modules_system_stubs = [ + "android.net.ipsec.ike.stubs.system", + "art.module.public.api.stubs", // Only has public stubs + "conscrypt.module.public.api.stubs", // Only has public stubs + "framework-connectivity.stubs.system", + "framework-media.stubs.system", + "framework-mediaprovider.stubs.system", + "framework-permission.stubs.system", + "framework-sdkextensions.stubs.system", + "framework-statsd.stubs.system", + "framework-tethering.stubs.system", + "framework-wifi.stubs.system", + "i18n.module.public.api.stubs", // Only has public stubs +] + java_defaults { name: "android_defaults_stubs_current", libs: [ "stub-annotations" ], @@ -299,19 +329,7 @@ java_defaults { java_library_static { name: "android_stubs_current", srcs: [ ":api-stubs-docs-non-updatable" ], - static_libs: [ - "android.net.ipsec.ike.stubs", - "art.module.public.api.stubs", - "conscrypt.module.public.api.stubs", - "framework-connectivity.stubs", - "framework-media.stubs", - "framework-mediaprovider.stubs", - "framework-permission.stubs", - "framework-sdkextensions.stubs", - "framework-statsd.stubs", - "framework-tethering.stubs", - "framework-wifi.stubs", - "i18n.module.public.api.stubs", + static_libs: modules_public_stubs + [ "private-stub-annotations-jar", ], defaults: ["android_defaults_stubs_current"], @@ -320,19 +338,7 @@ java_library_static { java_library_static { name: "android_system_stubs_current", srcs: [ ":system-api-stubs-docs-non-updatable" ], - static_libs: [ - "android.net.ipsec.ike.stubs.system", - "art.module.public.api.stubs", - "conscrypt.module.public.api.stubs", - "framework-connectivity.stubs.system", - "framework-media.stubs.system", - "framework-mediaprovider.stubs.system", - "framework-permission.stubs.system", - "framework-sdkextensions.stubs.system", - "framework-statsd.stubs.system", - "framework-tethering.stubs.system", - "framework-wifi.stubs.system", - "i18n.module.public.api.stubs", + static_libs: modules_system_stubs + [ "private-stub-annotations-jar", ], defaults: [ @@ -355,21 +361,9 @@ java_library_static { java_library_static { name: "android_test_stubs_current", srcs: [ ":test-api-stubs-docs-non-updatable" ], - static_libs: [ - // Modules do not have test APIs, but we want to include their SystemApis, like we include - // the SystemApi of framework-non-updatable-sources. - "android.net.ipsec.ike.stubs.system", - "art.module.public.api.stubs", - "conscrypt.module.public.api.stubs", - "framework-connectivity.stubs.system", - "framework-media.stubs.system", - "framework-mediaprovider.stubs.system", - "framework-permission.stubs.system", - "framework-sdkextensions.stubs.system", - "framework-statsd.stubs.system", - "framework-tethering.stubs.system", - "framework-wifi.stubs.system", - "i18n.module.public.api.stubs", + // Modules do not have test APIs, but we want to include their SystemApis, like we include + // the SystemApi of framework-non-updatable-sources. + static_libs: modules_system_stubs + [ "private-stub-annotations-jar", ], defaults: [ |