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

Commit 71efd472 authored by Paul Duffin's avatar Paul Duffin Committed by Automerger Merge Worker
Browse files

Merge "Switch to standard naming scheme" am: b04aea27 

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

Change-Id: Ic1b75b3a6cd0db02d485ecd2ed3939d9faca8200
parents c0cc6209 b04aea27

Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -372,7 +372,7 @@ java_library { 
    name: "framework-updatable-stubs-module_libs_api",

    name: "framework-updatable-stubs-module_libs_api",

    static_libs: [

    static_libs: [

        "framework-sdkextensions-stubs-module_libs_api",

        "framework-sdkextensions-stubs-module_libs_api",

        "framework-tethering-stubs-module_libs_api",

        "framework-tethering.stubs.module_lib",

        "updatable_media_stubs",

        "updatable_media_stubs",

    ],

    ],

    sdk_version: "module_current",

    sdk_version: "module_current",

packages/Tethering/common/TetheringLib/Android.bp

+0 −5
Original line number Original line Diff line number Diff line
@@ -30,11 +30,6 @@ java_sdk_library { 
        ":framework-tethering-srcs",

        ":framework-tethering-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",



    jarjar_rules: "jarjar-rules.txt",

    jarjar_rules: "jarjar-rules.txt",

    installable: true,

    installable: true,

services/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -72,7 +72,7 @@ java_library { 




    libs: [

    libs: [

        "android.hidl.manager-V1.0-java",

        "android.hidl.manager-V1.0-java",

        "framework-tethering-stubs-module_libs_api",

        "framework-tethering.stubs.module_lib",

    ],

    ],





    // Uncomment to enable output of certain warnings (deprecated, unchecked)

    // Uncomment to enable output of certain warnings (deprecated, unchecked)

services/core/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -30,7 +30,7 @@ java_library_static { 
        "android.hardware.vibrator-java",

        "android.hardware.vibrator-java",

        "android.net.ipsec.ike.stubs.module_lib",

        "android.net.ipsec.ike.stubs.module_lib",

        "app-compat-annotations",

        "app-compat-annotations",

        "framework-tethering-stubs-module_libs_api",

        "framework-tethering.stubs.module_lib",

    ],

    ],





    required: [

    required: [