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

Commit 8b864fb4 authored by Paul Duffin's avatar Paul Duffin
Browse files

Switch to standard naming scheme 

Removes use of the special framework-modules naming scheme.

Bug: 155164730
Test: m java
Exempt-From-Owner-Approval: Build cleanup.
Change-Id: I0c31e2183353dfb5bd49f04f3455cb7b10be6866
parent 1081372a

Android.bp

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

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

        "framework-graphics-stubs-module_libs_api",

        "framework-media-stubs-module_libs_api",

        "framework-mediaprovider-stubs-module_libs_api",

        "framework-permission-stubs-module_libs_api",

        "framework-sdkextensions-stubs-module_libs_api",

        "framework-statsd-stubs-module_libs_api",

        "framework-tethering-stubs-module_libs_api",

        "framework-wifi-stubs-module_libs_api",

        "framework-media.stubs.module_lib",

        "framework-mediaprovider.stubs.module_lib",

        "framework-permission.stubs.module_lib",

        "framework-sdkextensions.stubs.module_lib",

        "framework-statsd.stubs.module_lib",

        "framework-tethering.stubs.module_lib",

        "framework-wifi.stubs.module_lib",

    ],

    sdk_version: "module_current",

    visibility: [":__pkg__"],

StubLibraries.bp

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

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

        "framework-graphics-stubs-publicapi",

        "framework-media-stubs-publicapi",

        "framework-mediaprovider-stubs-publicapi",

        "framework-permission-stubs-publicapi",

        "framework-sdkextensions-stubs-publicapi",

        "framework-statsd-stubs-publicapi",

        "framework-tethering-stubs-publicapi",

        "framework-wifi-stubs-publicapi",

        "framework-media.stubs",

        "framework-mediaprovider.stubs",

        "framework-permission.stubs",

        "framework-sdkextensions.stubs",

        "framework-statsd.stubs",

        "framework-tethering.stubs",

        "framework-wifi.stubs",

        "private-stub-annotations-jar",

    ],

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

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

        "framework-graphics-stubs-systemapi",

        "framework-media-stubs-systemapi",

        "framework-mediaprovider-stubs-systemapi",

        "framework-permission-stubs-systemapi",

        "framework-sdkextensions-stubs-systemapi",

        "framework-statsd-stubs-systemapi",

        "framework-tethering-stubs-systemapi",

        "framework-wifi-stubs-systemapi",

        "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",

        "private-stub-annotations-jar",

    ],

    defaults: ["android_defaults_stubs_current"],

apex/media/framework/Android.bp

+0 −5
Original line number Diff line number Diff line
@@ -96,11 +96,6 @@ java_sdk_library { 
        ":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: [

        "framework_media_annotation",

    ],

apex/permission/framework/Android.bp

+0 −5
Original line number Diff line number Diff line
@@ -28,11 +28,6 @@ java_sdk_library { 
        ":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: [

        "com.android.permission",

        "test_com.android.permission",

apex/statsd/framework/Android.bp

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

    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: [

        ":framework-statsd-sources",

    ],