LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Untie MultinetworkApiTest from platform libc++.so" am: 2e14e9afaa

Browse Source 
am: 4577e05c13

* commit '4577e05c13459a4fe27cd5e080eec04975160355':
  Untie MultinetworkApiTest from platform libc++.so
This commit is contained in:
Dimitry Ivanov
2016-01-12 21:28:10 +00:00
committed by android-build-merger
parent 074b8b0de5 04d19df9ca
commit 5a78c96856
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/cts/net/Android.mk
View File

@@ -27,7 +27,7 @@ LOCAL_MULTILIB := both
LOCAL_JAVA_LIBRARIES := voip-common conscrypt org.apache.http.legacy LOCAL_JAVA_LIBRARIES := voip-common conscrypt org.apache.http.legacy
LOCAL_JNI_SHARED_LIBRARIES := libcts_jni libnativedns_jni \ 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. # include CtsTestServer as a temporary hack to free net.cts from cts.stub.
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)

7
tests/cts/net/jni/Android.mk
View File

@@ -25,8 +25,8 @@ LOCAL_SRC_FILES := NativeDnsJni.c
LOCAL_C_INCLUDES := $(JNI_H_INCLUDE) 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 $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
@@ -35,5 +35,6 @@ LOCAL_MODULE := libnativemultinetwork_jni
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := NativeMultinetworkJni.c LOCAL_SRC_FILES := NativeMultinetworkJni.c
LOCAL_C_INCLUDES := $(JNI_H_INCLUDE) 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) include $(BUILD_SHARED_LIBRARY)