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

Commit 0caff966 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Update references to ike stubs" into rvc-dev am: ccb50a84 am: fdc719bd 

Change-Id: I9869a5402262bfa97d34187c3d42032335ea6588
parents 7cab2195 fdc719bd

services/core/Android.bp

+1 −2
Original line number Original line Diff line number Diff line
@@ -98,9 +98,9 @@ java_library_static { 
        "android.hardware.power-V1.0-java",

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

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

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

        "android.hardware.vibrator-java",

        "android.hardware.vibrator-java",

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

        "app-compat-annotations",

        "app-compat-annotations",

        "framework-tethering-stubs-module_libs_api",

        "framework-tethering-stubs-module_libs_api",

        "ike-stubs",

    ],

    ],





    required: [

    required: [
@@ -128,7 +128,6 @@ java_library_static { 
        "android.hidl.manager-V1.2-java",

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

        "dnsresolver_aidl_interface-V2-java",

        "dnsresolver_aidl_interface-V2-java",

        "netd_event_listener_interface-java",

        "netd_event_listener_interface-java",

        "ike-stubs",

        "overlayable_policy_aidl-java",

        "overlayable_policy_aidl-java",

    ],

    ],

services/robotests/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -27,7 +27,7 @@ android_app { 
        "services.net",

        "services.net",

    ],

    ],





    libs: ["ike-stubs"],

    libs: ["android.net.ipsec.ike.stubs.system"],

}

}





//##################################################################

//##################################################################

services/robotests/backup/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -29,7 +29,7 @@ android_app { 
        "services.net",

        "services.net",

    ],

    ],





    libs: ["ike-stubs"],

    libs: ["android.net.ipsec.ike.stubs.system"],

}

}





//##################################################################

//##################################################################