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

Commit 32b918d8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Specify version for aidl_interface explicitly" into sc-dev am: 0447ce4b 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If3c20a2ddbbfc1ec314ee44d44ca87d893d128a3
parents 3d9d45f5 0447ce4b

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -536,7 +536,7 @@ java_library { 
        "android.hardware.vibrator-V1.3-java",

        "android.security.apc-java",

        "android.security.authorization-java",

        "android.system.keystore2-java",

        "android.system.keystore2-V1-java",

        "android.system.suspend.control.internal-java",

        "cameraprotosnano",

        "devicepolicyprotosnano",

core/jni/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -207,9 +207,9 @@ cc_library_shared { 
            ],



            shared_libs: [

                "audioclient-types-aidl-unstable-cpp",

                "audioflinger-aidl-unstable-cpp",

                "av-types-aidl-unstable-cpp",

                "audioclient-types-aidl-cpp",

                "audioflinger-aidl-cpp",

                "av-types-aidl-cpp",

                "libandroidicu",

                "libbpf_android",

                "libnetdbpf",

media/jni/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ cc_library_shared { 
    ],



    shared_libs: [

        "audioclient-types-aidl-unstable-cpp",

        "av-types-aidl-unstable-cpp",

        "audioclient-types-aidl-cpp",

        "av-types-aidl-cpp",

        "libandroid_runtime",

        "libaudioclient",

        "libnativehelper",

services/core/Android.bp

+9 −9
Original line number Diff line number Diff line
@@ -100,10 +100,10 @@ java_library_static { 
    libs: [

        "services.net",

        "android.hardware.light-V2.0-java",

        "android.hardware.gnss-java",

        "android.hardware.power-java",

        "android.hardware.gnss-V1-java",

        "android.hardware.power-V1-java",

        "android.hardware.power-V1.0-java",

        "android.hardware.vibrator-java",

        "android.hardware.vibrator-V1-java",

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

        "app-compat-annotations",

        "framework-tethering.stubs.module_lib",
@@ -128,22 +128,22 @@ java_library_static { 
        "android.hardware.health-V1.0-java",

        "android.hardware.health-V2.0-java",

        "android.hardware.health-V2.1-java",

        "android.hardware.light-java",

        "android.hardware.light-V1-java",

        "android.hardware.tv.cec-V1.0-java",

        "android.hardware.weaver-V1.0-java",

        "android.hardware.biometrics.face-V1.1-java",

        "android.hardware.biometrics.face-java",

        "android.hardware.biometrics.face-V1-java",

        "android.hardware.biometrics.fingerprint-V2.3-java",

        "android.hardware.biometrics.fingerprint-java",

        "android.hardware.biometrics.fingerprint-V1-java",

        "android.hardware.oemlock-V1.0-java",

        "android.hardware.configstore-V1.0-java",

        "android.hardware.contexthub-V1.0-java",

        "android.hardware.rebootescrow-java",

        "android.hardware.rebootescrow-V1-java",

        "android.hardware.soundtrigger-V2.3-java",

        "android.hardware.power.stats-java",

        "android.hardware.power.stats-V1-java",

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

        "capture_state_listener-aidl-java",

        "dnsresolver_aidl_interface-java",

        "dnsresolver_aidl_interface-V7-java",

        "icu4j_calendar_astronomer",

        "netd-client",

        "overlayable_policy_aidl-java",

services/core/jni/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ cc_defaults { 
        "android.hardware.broadcastradio@1.0",

        "android.hardware.broadcastradio@1.1",

        "android.hardware.contexthub@1.0",

        "android.hardware.gnss-cpp",

        "android.hardware.gnss-V1-cpp",

        "android.hardware.gnss@1.0",

        "android.hardware.gnss@1.1",

        "android.hardware.gnss@2.0",
@@ -147,12 +147,12 @@ cc_defaults { 
        "android.hardware.light@2.0",

        "android.hardware.power@1.0",

        "android.hardware.power@1.1",

        "android.hardware.power-cpp",

        "android.hardware.power-V1-cpp",

        "android.hardware.power.stats@1.0",

        "android.hardware.power.stats-ndk_platform",

        "android.hardware.thermal@1.0",

        "android.hardware.tv.input@1.0",

        "android.hardware.vibrator-unstable-cpp",

        "android.hardware.vibrator-V2-cpp",

        "android.hardware.vibrator@1.0",

        "android.hardware.vibrator@1.1",

        "android.hardware.vibrator@1.2",
@@ -162,7 +162,7 @@ cc_defaults { 
        "android.frameworks.schedulerservice@1.0",

        "android.frameworks.sensorservice@1.0",

        "android.frameworks.stats@1.0",

        "android.system.suspend.control-cpp",

        "android.system.suspend.control-V1-cpp",

        "android.system.suspend.control.internal-cpp",

        "android.system.suspend@1.0",

        "service.incremental",