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

Commit 33df011e authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6554163 from 734934aa to mainline-release 

Change-Id: Ibd563a89b7edf28ac2fb0d3a46d27061829710f9
parents ae432e04 734934aa

Android.bp

+7 −7
Original line number Diff line number Diff line
@@ -292,13 +292,13 @@ filegroup { 
java_library {

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

    static_libs: [

        "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
@@ -329,13 +329,13 @@ java_library_static { 
    srcs: [ ":api-stubs-docs-non-updatable" ],

    static_libs: [

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

        "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"],
@@ -359,13 +359,13 @@ java_library_static { 
    srcs: [ ":system-api-stubs-docs-non-updatable" ],

    static_libs: [

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

        "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
@@ -38,11 +38,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

+3 −8
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ genrule { 
    name: "statslog-statsd-java-gen",

    tools: ["stats-log-api-gen"],

    cmd: "$(location stats-log-api-gen) --java $(out) --module statsd" +

         " --javaPackage com.android.internal.util --javaClass StatsdStatsLog",

    out: ["com/android/internal/util/StatsdStatsLog.java"],

         " --javaPackage com.android.internal.statsd --javaClass StatsdStatsLog",

    out: ["com/android/internal/statsd/StatsdStatsLog.java"],

}



java_library_static {
@@ -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",

    ],
@@ -65,7 +60,7 @@ java_sdk_library { 
        "android.os",

        "android.util",

        // From :statslog-statsd-java-gen

        "com.android.internal.util",

        "com.android.internal.statsd",

    ],



    api_packages: [