Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d273bfe authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Remove libservicestestsjni" am: d00478e9 am: 301c714b

am: dcb0c55c

Change-Id: I55f8fed5eff824e792cbfc29b7cd7b496cad106c
parents 8ec5d822 dcb0c55c
Loading
Loading
Loading
Loading
+1 −34
Original line number Diff line number Diff line
@@ -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)