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

Commit 360a4858 authored by Paul Duffin's avatar Paul Duffin Committed by Android (Google) Code Review
Browse files

Merge "Switch to standard naming scheme"

parents edbbc447 8b864fb4

Android.bp

+7 −7
Original line number Original line Diff line number Diff line
@@ -373,13 +373,13 @@ java_library { 
    static_libs: [

    static_libs: [

        "framework-appsearch-stubs", // TODO: Update to module_libs_api when there is one.

        "framework-appsearch-stubs", // TODO: Update to module_libs_api when there is one.

        "framework-graphics-stubs-module_libs_api",

        "framework-graphics-stubs-module_libs_api",

        "framework-media-stubs-module_libs_api",

        "framework-media.stubs.module_lib",

        "framework-mediaprovider-stubs-module_libs_api",

        "framework-mediaprovider.stubs.module_lib",

        "framework-permission-stubs-module_libs_api",

        "framework-permission.stubs.module_lib",

        "framework-sdkextensions-stubs-module_libs_api",

        "framework-sdkextensions.stubs.module_lib",

        "framework-statsd-stubs-module_libs_api",

        "framework-statsd.stubs.module_lib",

        "framework-tethering-stubs-module_libs_api",

        "framework-tethering.stubs.module_lib",

        "framework-wifi-stubs-module_libs_api",

        "framework-wifi.stubs.module_lib",

    ],

    ],

    sdk_version: "module_current",

    sdk_version: "module_current",

    visibility: [":__pkg__"],

    visibility: [":__pkg__"],

StubLibraries.bp

+14 −14
Original line number Original line Diff line number Diff line
@@ -338,13 +338,13 @@ java_library_static { 
    static_libs: [

    static_libs: [

        "conscrypt.module.public.api.stubs",

        "conscrypt.module.public.api.stubs",

        "framework-graphics-stubs-publicapi",

        "framework-graphics-stubs-publicapi",

        "framework-media-stubs-publicapi",

        "framework-media.stubs",

        "framework-mediaprovider-stubs-publicapi",

        "framework-mediaprovider.stubs",

        "framework-permission-stubs-publicapi",

        "framework-permission.stubs",

        "framework-sdkextensions-stubs-publicapi",

        "framework-sdkextensions.stubs",

        "framework-statsd-stubs-publicapi",

        "framework-statsd.stubs",

        "framework-tethering-stubs-publicapi",

        "framework-tethering.stubs",

        "framework-wifi-stubs-publicapi",

        "framework-wifi.stubs",

        "private-stub-annotations-jar",

        "private-stub-annotations-jar",

    ],

    ],

    defaults: ["android_defaults_stubs_current"],

    defaults: ["android_defaults_stubs_current"],
@@ -370,13 +370,13 @@ java_library_static { 
        "conscrypt.module.public.api.stubs",

        "conscrypt.module.public.api.stubs",

        "framework-appsearch-stubs", // TODO: standardize appsearch stubs

        "framework-appsearch-stubs", // TODO: standardize appsearch stubs

        "framework-graphics-stubs-systemapi",

        "framework-graphics-stubs-systemapi",

        "framework-media-stubs-systemapi",

        "framework-media.stubs.system",

        "framework-mediaprovider-stubs-systemapi",

        "framework-mediaprovider.stubs.system",

        "framework-permission-stubs-systemapi",

        "framework-permission.stubs.system",

        "framework-sdkextensions-stubs-systemapi",

        "framework-sdkextensions.stubs.system",

        "framework-statsd-stubs-systemapi",

        "framework-statsd.stubs.system",

        "framework-tethering-stubs-systemapi",

        "framework-tethering.stubs.system",

        "framework-wifi-stubs-systemapi",

        "framework-wifi.stubs.system",

        "private-stub-annotations-jar",

        "private-stub-annotations-jar",

    ],

    ],

    defaults: ["android_defaults_stubs_current"],

    defaults: ["android_defaults_stubs_current"],

apex/media/framework/Android.bp

+0 −5
Original line number Original line Diff line number Diff line
@@ -96,11 +96,6 @@ java_sdk_library { 
        ":updatable-media-srcs",

        ":updatable-media-srcs",

    ],

    ],





    // TODO(b/155480189) - Remove naming_scheme once references have been resolved.

    // Temporary java_sdk_library component naming scheme to use to ease the transition from separate

    // modules to java_sdk_library.

    naming_scheme: "framework-modules",



    libs: [

    libs: [

        "framework_media_annotation",

        "framework_media_annotation",

    ],

    ],

apex/permission/framework/Android.bp

+0 −5
Original line number Original line Diff line number Diff line
@@ -38,11 +38,6 @@ java_sdk_library { 
        ":framework-permission-sources",

        ":framework-permission-sources",

    ],

    ],





    // TODO(b/155480189) - Remove naming_scheme once references have been resolved.

    // Temporary java_sdk_library component naming scheme to use to ease the transition from separate

    // modules to java_sdk_library.

    naming_scheme: "framework-modules",



    apex_available: [

    apex_available: [

        "com.android.permission",

        "com.android.permission",

        "test_com.android.permission",

        "test_com.android.permission",

apex/statsd/framework/Android.bp

+0 −5
Original line number Original line Diff line number Diff line
@@ -51,11 +51,6 @@ java_sdk_library { 
    defaults: ["framework-module-defaults"],

    defaults: ["framework-module-defaults"],

    installable: true,

    installable: true,





    // TODO(b/155480189) - Remove naming_scheme once references have been resolved.

    // Temporary java_sdk_library component naming scheme to use to ease the transition from separate

    // modules to java_sdk_library.

    naming_scheme: "framework-modules",



    srcs: [

    srcs: [

        ":framework-statsd-sources",

        ":framework-statsd-sources",

    ],

    ],