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

Commit b04aea27 authored by Paul Duffin's avatar Paul Duffin Committed by Gerrit Code Review
Browse files

Merge "Switch to standard naming scheme"

parents 415e2387 01fd6ff9
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -372,7 +372,7 @@ java_library {
    name: "framework-updatable-stubs-module_libs_api",
    static_libs: [
        "framework-sdkextensions-stubs-module_libs_api",
        "framework-tethering-stubs-module_libs_api",
        "framework-tethering.stubs.module_lib",
        "updatable_media_stubs",
    ],
    sdk_version: "module_current",
+0 −5
Original line number Diff line number Diff line
@@ -30,11 +30,6 @@ java_sdk_library {
        ":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",
    installable: true,

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

    libs: [
        "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)
+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ java_library_static {
        "android.hardware.vibrator-java",
        "android.net.ipsec.ike.stubs.module_lib",
        "app-compat-annotations",
        "framework-tethering-stubs-module_libs_api",
        "framework-tethering.stubs.module_lib",
    ],

    required: [