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

Commit 2f5d7d85 authored by Steven Moreland's avatar Steven Moreland
Browse files

framework.jar: Include all radio HIDL libs. 

Before, some of these were duplicated, some weren't. Now they are here
and telephony-common doesn't double-include them.

Bug: 111107855
Test: (sanity) boot Pixel 2 and check logs
Change-Id: I5b40ba139d60ff330cfbc0d9d881f775616ad0dd
Merged-In: I5b40ba139d60ff330cfbc0d9d881f775616ad0dd
parent 3fc95847

Android.bp

+11 −10
Original line number Diff line number Diff line
@@ -674,7 +674,7 @@ java_defaults { 
        "ext",

    ],



    jarjar_rules: ":framework-hidl-jarjar",

    jarjar_rules: "jarjar_rules_hidl.txt",



    static_libs: [

        "apex_aidl_interface-java",
@@ -684,18 +684,24 @@ java_defaults { 
        "android.hardware.cas-V1.0-java",

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

        "android.hardware.health-V1.0-java-constants",

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

        "android.hardware.radio-V1.1-java",

        "android.hardware.radio-V1.2-java",

        "android.hardware.radio-V1.3-java",

        "android.hardware.radio-V1.4-java",

        "android.hardware.radio.config-V1.0-java",

        "android.hardware.radio.config-V1.1-java",

        "android.hardware.radio.config-V1.2-java",

        "android.hardware.radio.deprecated-V1.0-java",

        "android.hardware.thermal-V1.0-java-constants",

        "android.hardware.tv.input-V1.0-java-constants",

        "android.hardware.usb-V1.0-java-constants",

        "android.hardware.usb-V1.1-java-constants",

        "android.hardware.usb.gadget-V1.0-java",

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

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

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

        "android.hardware.wifi-V1.0-java-constants",

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

        "android.hardware.radio-V1.3-java",

        "android.hardware.radio-V1.4-java",

        "android.hardware.usb.gadget-V1.0-java",

        "networkstack-aidl-interfaces-java",

        "netd_aidl_interface-java",

    ],
@@ -730,11 +736,6 @@ filegroup { 
    ],

}



filegroup {

    name: "framework-hidl-jarjar",

    srcs: ["jarjar_rules_hidl.txt"],

}



java_library {

    name: "framework",

    defaults: ["framework-defaults"],