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

Commit bd0e762d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Specify version for aidl_interface explicitly" am: 5968a390 am: 8add53a3 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idd7b735da71f7beebc7976ae0a3bd33b98b0020c
parents 398301fd 8add53a3

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -484,7 +484,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",

        "devicepolicyprotosnano",

services/core/Android.bp

+5 −5
Original line number Diff line number Diff line
@@ -102,9 +102,9 @@ java_library_static { 
    libs: [

        "services.net",

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

        "android.hardware.power-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",
@@ -127,7 +127,7 @@ 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.0-java",
@@ -135,11 +135,11 @@ java_library_static { 
        "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.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

+3 −3
Original line number Diff line number Diff line
@@ -147,11 +147,11 @@ 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.thermal@1.0",

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

        "android.hardware.vibrator-cpp",

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

        "android.hardware.vibrator@1.0",

        "android.hardware.vibrator@1.1",

        "android.hardware.vibrator@1.2",
@@ -160,7 +160,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",

services/incremental/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -51,9 +51,9 @@ cc_defaults { 
    static_libs: [

        "libbase",

        "libext2_uuid",

        "libdataloader_aidl-unstable-cpp",

        "libincremental_aidl-unstable-cpp",

        "libincremental_manager_aidl-unstable-cpp",

        "libdataloader_aidl-cpp",

        "libincremental_aidl-cpp",

        "libincremental_manager_aidl-cpp",

        "libprotobuf-cpp-lite",

        "service.incremental.proto",

        "libutils",

services/tests/servicestests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ android_test { 
        "libui",

        "libunwindstack",

        "libutils",

        "netd_aidl_interface-cpp",

        "netd_aidl_interface-V5-cpp",

    ],



    dxflags: ["--multi-dex"],