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

Commit 02d88d73 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Automerger Merge Worker
Browse files

Merge "libradiocompat: Move all AIDL dependencies to a separate cc_defaults"... 

Merge "libradiocompat: Move all AIDL dependencies to a separate cc_defaults" into main am: 65dc3587

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3315066



Change-Id: I55aab44775e07e985348f24f61aa4966ff062057
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5ffbdcd2 65dc3587

radio/aidl/compat/libradiocompat/Android.bp

+17 −10
Original line number Diff line number Diff line
@@ -22,8 +22,25 @@ package { 
    default_applicable_licenses: ["hardware_interfaces_license"],

}



cc_defaults {

    name: "android.hardware.radio-library.aidl_deps",

    shared_libs: [

        "android.hardware.radio.config-V3-ndk",

        "android.hardware.radio.data-V3-ndk",

        "android.hardware.radio.ims-V2-ndk",

        "android.hardware.radio.ims.media-V2-ndk",

        "android.hardware.radio.messaging-V3-ndk",

        "android.hardware.radio.modem-V3-ndk",

        "android.hardware.radio.network-V3-ndk",

        "android.hardware.radio.sap-V1-ndk",

        "android.hardware.radio.sim-V3-ndk",

        "android.hardware.radio.voice-V3-ndk",

    ],

}



cc_library {

    name: "android.hardware.radio-library.compat",

    defaults: ["android.hardware.radio-library.aidl_deps"],

    relative_install_path: "hw",

    vendor: true,

    cflags: [
@@ -32,20 +49,10 @@ cc_library { 
        "-DANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION",

    ],

    shared_libs: [

        "android.hardware.radio.config-V3-ndk",

        "android.hardware.radio.config@1.0",

        "android.hardware.radio.config@1.1",

        "android.hardware.radio.config@1.2",

        "android.hardware.radio.config@1.3",

        "android.hardware.radio.data-V3-ndk",

        "android.hardware.radio.ims-V2-ndk",

        "android.hardware.radio.ims.media-V2-ndk",

        "android.hardware.radio.messaging-V3-ndk",

        "android.hardware.radio.modem-V3-ndk",

        "android.hardware.radio.network-V3-ndk",

        "android.hardware.radio.sap-V1-ndk",

        "android.hardware.radio.sim-V3-ndk",

        "android.hardware.radio.voice-V3-ndk",

        "android.hardware.radio@1.0",

        "android.hardware.radio@1.1",

        "android.hardware.radio@1.2",

radio/aidl/compat/service/Android.bp

+1 −10
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ package { 


cc_binary {

    name: "android.hardware.radio-service.compat",

    defaults: ["android.hardware.radio-library.aidl_deps"],

    relative_install_path: "hw",

    init_rc: ["radio-compat.rc"],

    vintf_fragments: ["radio-compat.xml"],
@@ -35,20 +36,10 @@ cc_binary { 
    ],

    shared_libs: [

        "android.hardware.radio-library.compat",

        "android.hardware.radio.config-V3-ndk",

        "android.hardware.radio.config@1.0",

        "android.hardware.radio.config@1.1",

        "android.hardware.radio.config@1.2",

        "android.hardware.radio.config@1.3",

        "android.hardware.radio.data-V3-ndk",

        "android.hardware.radio.ims-V2-ndk",

        "android.hardware.radio.ims.media-V2-ndk",

        "android.hardware.radio.messaging-V3-ndk",

        "android.hardware.radio.modem-V3-ndk",

        "android.hardware.radio.network-V3-ndk",

        "android.hardware.radio.sap-V1-ndk",

        "android.hardware.radio.sim-V3-ndk",

        "android.hardware.radio.voice-V3-ndk",

        "android.hardware.radio@1.0",

        "android.hardware.radio@1.1",

        "android.hardware.radio@1.2",