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

Commit c2d478b6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove libservicestestsjni"

parents ddbf138b e399468b

services/tests/notification/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -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 \

services/tests/servicestests/Android.mk

+1 −34
Original line number Diff line number Diff line
@@ -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)