DO NOT MERGE [benchmark] remove unnecessary shared libs, fix apct

The continuous execution environment is not finding these and shouldn't
need access to them if instead we can just statically link as much as
possible.

Fixes the testrun on angler-userdebug which doesn't seem to have
libnetd_aidl or liblogwrap available by default

Test: mma -j30 netd_benchmark && ${OUT}/data/benchmarktest/netd_benchmark/netd_benchmark /data/netd_benchmark && adb shell /data/netd_benchmark

(cherry picked from commit 3cea1d5a7702568e6c4b11777f01661372bf5ad7)

Change-Id: Ib2fb9624a8aa2cdd81add575dfded1d6e6c07455

diff --git a/tests/benchmarks/Android.mk b/tests/benchmarks/Android.mk
index 8743abc..c4f432b 100644 (file)
--- a/tests/benchmarks/Android.mk
+++ b/tests/benchmarks/Android.mk
@@ -23,25 +23,22 @@ LOCAL_CFLAGS := -Wall -Werror -Wunused-parameter
 LOCAL_CFLAGS += -Wno-varargs
 
 EXTRA_LDLIBS := -lpthread
-LOCAL_SHARED_LIBRARIES += libbase libbinder libcutils liblog liblogwrap libnetdaidl \
-                          libnetutils libutils libnetd_client
-LOCAL_STATIC_LIBRARIES += libnetd_test_dnsresponder libtestUtil
+LOCAL_SHARED_LIBRARIES += libbase libbinder liblog libnetd_client
+LOCAL_STATIC_LIBRARIES += libnetd_test_dnsresponder libtestUtil libutils
 
 LOCAL_AIDL_INCLUDES := system/netd/server/binder
 LOCAL_C_INCLUDES += system/netd/include \
                     system/extras/tests/include \
-                    system/netd/binder/include \
                     system/netd/client \
                     system/netd/server \
+                    system/netd/server/binder \
                     system/netd/tests/dns_responder \
-                    system/core/logwrapper/include \
-                    system/core/libnetutils/include \
-                    system/extras/tests/include bionic/libc/dns/include
+                    system/extras/tests/include \
+                    bionic/libc/dns/include
 
 LOCAL_SRC_FILES := main.cpp \
                    connect_benchmark.cpp \
-                   dns_benchmark.cpp \
-                   ../../server/NetdConstants.cpp
+                   dns_benchmark.cpp
 
 LOCAL_MODULE_TAGS := eng tests
 

diff --git a/tests/dns_responder/Android.mk b/tests/dns_responder/Android.mk
index 0a1ff4d..a794992 100644 (file)
--- a/tests/dns_responder/Android.mk
+++ b/tests/dns_responder/Android.mk
@@ -23,22 +23,23 @@ LOCAL_CFLAGS := -Wall -Werror -Wunused-parameter
 LOCAL_CFLAGS += -Wno-varargs
 
 EXTRA_LDLIBS := -lpthread
-LOCAL_SHARED_LIBRARIES += libbase libbinder libcutils liblog liblogwrap libnetdaidl libnetd_client \
-                          libnetutils libutils
+LOCAL_SHARED_LIBRARIES += libbase libbinder liblog libnetd_client
+LOCAL_STATIC_LIBRARIES += libutils
+
+LOCAL_AIDL_INCLUDES += system/netd/server/binder
 
 LOCAL_C_INCLUDES += system/netd/include \
                     system/extras/tests/include \
-                    system/netd/binder/include \
                     system/netd/server \
+                    system/netd/server/binder \
                     system/netd/tests/dns_responder \
-                    system/core/logwrapper/include \
-                    system/core/libnetutils/include \
                     system/extras/tests/include \
                     bionic/libc/dns/include
 
 LOCAL_SRC_FILES := dns_responder.cpp \
                    dns_responder_client.cpp \
-                   ../../server/NetdConstants.cpp
+                   ../../server/binder/android/net/INetd.aidl \
+                   ../../server/binder/android/net/UidRange.cpp
 
 LOCAL_MODULE_TAGS := eng tests