From 04d19df9caf0a90ff598da2e6d38f8104dd8923f Mon Sep 17 00:00:00 2001 From: Dimitry Ivanov Date: Tue, 12 Jan 2016 11:49:57 -0800 Subject: [PATCH] Untie MultinetworkApiTest from platform libc++.so Bug: http://b/26512135 Change-Id: Ia01fd851fd7d2e50708620adf11d904e42de0b3b --- tests/cts/net/Android.mk | 2 +- tests/cts/net/jni/Android.mk | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/cts/net/Android.mk b/tests/cts/net/Android.mk index 652487126d..56729b6be2 100644 --- a/tests/cts/net/Android.mk +++ b/tests/cts/net/Android.mk @@ -27,7 +27,7 @@ LOCAL_MULTILIB := both LOCAL_JAVA_LIBRARIES := voip-common conscrypt org.apache.http.legacy LOCAL_JNI_SHARED_LIBRARIES := libcts_jni libnativedns_jni \ - libnativemultinetwork_jni + libnativemultinetwork_jni libnativehelper_compat_libc++ # include CtsTestServer as a temporary hack to free net.cts from cts.stub. LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/tests/cts/net/jni/Android.mk b/tests/cts/net/jni/Android.mk index ca82b30b13..0ec8d28afd 100644 --- a/tests/cts/net/jni/Android.mk +++ b/tests/cts/net/jni/Android.mk @@ -25,8 +25,8 @@ LOCAL_SRC_FILES := NativeDnsJni.c LOCAL_C_INCLUDES := $(JNI_H_INCLUDE) -LOCAL_SHARED_LIBRARIES := libnativehelper liblog - +LOCAL_SHARED_LIBRARIES := libnativehelper_compat_libc++ liblog +LOCAL_CXX_STL := libc++_static include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) @@ -35,5 +35,6 @@ LOCAL_MODULE := libnativemultinetwork_jni LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := NativeMultinetworkJni.c LOCAL_C_INCLUDES := $(JNI_H_INCLUDE) -LOCAL_SHARED_LIBRARIES := libandroid libnativehelper liblog +LOCAL_SHARED_LIBRARIES := libandroid libnativehelper_compat_libc++ liblog +LOCAL_CXX_STL := libc++_static include $(BUILD_SHARED_LIBRARY)