Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2b97f6f authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Separate out lists of modules from build rules" am: 6b35a8ac 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671345

Change-Id: I5a6dbacb50c3e7b9a7493124c4c6f8ab005eea3a
parents 3858d8f5 6b35a8ac

StubLibraries.bp

+35 −41
Original line number Diff line number Diff line
@@ -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",

    static_libs: modules_system_stubs + [

        "private-stub-annotations-jar",

    ],

    defaults: [