Merge "Remove libservicestestsjni" am: d00478e9ad am: 301c714b43

am: dcb0c55c15

Change-Id: I55f8fed5eff824e792cbfc29b7cd7b496cad106c
This commit is contained in:
Colin Cross
2017-01-12 05:11:47 +00:00
committed by android-build-merger

View File

@@ -31,7 +31,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 \
@@ -53,36 +53,3 @@ LOCAL_JACK_FLAGS := --multi-dex native
endif # EMMA_INSTRUMENT_STATIC
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)