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

Commit d09bf362 authored by Jeongik Cha's avatar Jeongik Cha Committed by Android (Google) Code Review
Browse files

Merge changes from topic "150578172-ns" into sc-dev 

* changes:
  [automerge] Specify version for aidl_interface explicitly 2p: 44c15f1e
  Specify version for aidl_interface explicitly
parents 23b4e679 16f9a78b

Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -88,7 +88,7 @@ java_defaults { 
    libs: ["unsupportedappusage"],

    libs: ["unsupportedappusage"],

    static_libs: [

    static_libs: [

        "androidx.annotation_annotation",

        "androidx.annotation_annotation",

        "netd_aidl_interface-java",

        "netd_aidl_interface-lateststable-java",

        "netlink-client",

        "netlink-client",

        "networkstack-client",

        "networkstack-client",

        "net-utils-framework-common",

        "net-utils-framework-common",

common/networkstackclient/Android.bp

+2 −2
Original line number Original line Diff line number Diff line
@@ -152,8 +152,8 @@ java_library { 
        "src/android/net/shared/**/*.java",

        "src/android/net/shared/**/*.java",

    ],

    ],

    static_libs: [

    static_libs: [

        "ipmemorystore-aidl-interfaces-java",

        "ipmemorystore-aidl-interfaces-V10-java",

        "networkstack-aidl-interfaces-java",

        "networkstack-aidl-interfaces-V10-java",

    ],

    ],

    visibility: [

    visibility: [

        "//frameworks/base/packages/Tethering",

        "//frameworks/base/packages/Tethering",