diff options
| author | 2017-01-12 02:55:12 +0000 | |
|---|---|---|
| committer | 2017-01-12 02:55:15 +0000 | |
| commit | c2d478b658bda65afc882d7fb12215b3ea99300c (patch) | |
| tree | fdcfc944b338e9b35a84889fc4e643dcef61e673 | |
| parent | ddbf138b808f18db7a5d787c25059deccec116f9 (diff) | |
| parent | e399468b88ae84a586f9d583251ee0a6a7e94a43 (diff) | |
Merge "Remove libservicestestsjni"
| -rw-r--r-- | services/tests/notification/Android.mk | 2 | ||||
| -rw-r--r-- | services/tests/servicestests/Android.mk | 35 |
2 files changed, 2 insertions, 35 deletions
diff --git a/services/tests/notification/Android.mk b/services/tests/notification/Android.mk index 8aded6010a84..bc37fef14cec 100644 --- a/services/tests/notification/Android.mk +++ b/services/tests/notification/Android.mk @@ -32,7 +32,7 @@ LOCAL_PACKAGE_NAME := FrameworksNotificationTests LOCAL_CERTIFICATE := platform # These are not normally accessible from apps so they must be explicitly included. -LOCAL_JNI_SHARED_LIBRARIES := libservicestestsjni \ +LOCAL_JNI_SHARED_LIBRARIES := \ libbacktrace \ libbase \ libbinder \ diff --git a/services/tests/servicestests/Android.mk b/services/tests/servicestests/Android.mk index f934d347080f..15c61f6f228b 100644 --- a/services/tests/servicestests/Android.mk +++ b/services/tests/servicestests/Android.mk @@ -34,7 +34,7 @@ LOCAL_PACKAGE_NAME := FrameworksServicesTests LOCAL_CERTIFICATE := platform # These are not normally accessible from apps so they must be explicitly included. -LOCAL_JNI_SHARED_LIBRARIES := libservicestestsjni \ +LOCAL_JNI_SHARED_LIBRARIES := \ libbacktrace \ libbase \ libbinder \ @@ -55,36 +55,3 @@ LOCAL_JACK_FLAGS := --multi-dex native LOCAL_STATIC_JAVA_LIBRARIES += ub-uiautomator include $(BUILD_PACKAGE) - -######################################################################### -# Build JNI Shared Library -######################################################################### - -LOCAL_PATH:= $(LOCAL_PATH)/jni - -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := tests - -LOCAL_CFLAGS := -Wall -Wextra -Werror - -LOCAL_C_INCLUDES := \ - libpcap \ - hardware/google/apf - -LOCAL_SRC_FILES := $(call all-cpp-files-under) - -LOCAL_SHARED_LIBRARIES := \ - libbinder \ - liblog \ - libcutils \ - libnativehelper \ - libnetdaidl - -LOCAL_STATIC_LIBRARIES := \ - libpcap \ - libapf - -LOCAL_MODULE := libservicestestsjni - -include $(BUILD_SHARED_LIBRARY) |