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

Commit c2126e20 authored by Luke Huang's avatar Luke Huang Committed by android-build-merger
Browse files

Merge "Migrate INetd to stable aidl" am: 9677dde1 

am: ef6b675a

Change-Id: I326e91ba97b77f0b62b372dd8bddc7bca77e41d7
parents 5709582a ef6b675a

Android.bp

+0 −1
Original line number Original line Diff line number Diff line
@@ -599,7 +599,6 @@ java_defaults { 
        ":libupdate_engine_aidl",

        ":libupdate_engine_aidl",





        ":storaged_aidl",

        ":storaged_aidl",

        ":netd_aidl",

        ":vold_aidl",

        ":vold_aidl",

        ":installd_aidl",

        ":installd_aidl",

        ":dumpstate_aidl",

        ":dumpstate_aidl",

services/core/Android.bp

+0 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,6 @@ java_library_static { 
        ":mediaupdateservice_aidl",

        ":mediaupdateservice_aidl",

        "java/com/android/server/EventLogTags.logtags",

        "java/com/android/server/EventLogTags.logtags",

        "java/com/android/server/am/EventLogTags.logtags",

        "java/com/android/server/am/EventLogTags.logtags",

        ":netd_aidl",

        ":netd_metrics_aidl",

        ":netd_metrics_aidl",

    ],

    ],

services/tests/servicestests/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -66,10 +66,10 @@ android_test { 
        "liblog",

        "liblog",

        "liblzma",

        "liblzma",

        "libnativehelper",

        "libnativehelper",

        "libnetdaidl",

        "libui",

        "libui",

        "libunwind",

        "libunwind",

        "libutils",

        "libutils",

        "netd_aidl_interface-cpp",

    ],

    ],





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

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

services/tests/uiservicestests/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -50,9 +50,9 @@ android_test { 
        "liblog",

        "liblog",

        "liblzma",

        "liblzma",

        "libnativehelper",

        "libnativehelper",

        "libnetdaidl",

        "libui",

        "libui",

        "libunwind",

        "libunwind",

        "libutils",

        "libutils",

        "netd_aidl_interface-cpp",

    ],

    ],

}
 
}

tests/net/Android.mk

+0 −2
Original line number Original line Diff line number Diff line
@@ -51,7 +51,6 @@ LOCAL_JNI_SHARED_LIBRARIES := \ 
    liblog \

    liblog \

    liblzma \

    liblzma \

    libnativehelper \

    libnativehelper \

    libnetdaidl \

    libpackagelistparser \

    libpackagelistparser \

    libpcre2 \

    libpcre2 \

    libselinux \

    libselinux \
@@ -93,7 +92,6 @@ LOCAL_SHARED_LIBRARIES := \ 
  liblog \

  liblog \

  libcutils \

  libcutils \

  libnativehelper \

  libnativehelper \

  libnetdaidl \

  netd_aidl_interface-cpp

  netd_aidl_interface-cpp





LOCAL_STATIC_LIBRARIES := \

LOCAL_STATIC_LIBRARIES := \