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

Commit fbb8db2e authored by Dan Albert's avatar Dan Albert
Browse files

Remove makefile cruft. 

Don't manually include stlport, and don't use private bionic headers.

Change-Id: I0fc4e8b34ab449e9ef07c26f71e472fca5640590
parent 91baad56

libcutils/tests/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ test_src_files := \ 
    PropertiesTest.cpp \



include $(CLEAR_VARS)

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

LOCAL_MODULE := libcutils_test

LOCAL_SRC_FILES := $(test_src_files)

LOCAL_SHARED_LIBRARIES := \
@@ -32,6 +33,7 @@ LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 
include $(BUILD_NATIVE_TEST)



include $(CLEAR_VARS)

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

LOCAL_MODULE := libcutils_test_static

LOCAL_FORCE_STATIC_EXECUTABLE := true

LOCAL_SRC_FILES := $(test_src_files)

liblog/tests/Android.mk

+1 −4
Original line number Diff line number Diff line
@@ -43,11 +43,8 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk 
LOCAL_CFLAGS += $(benchmark_c_flags)

LOCAL_SHARED_LIBRARIES += liblog libm

LOCAL_SRC_FILES := $(benchmark_src_files)

ifndef LOCAL_SDK_VERSION

LOCAL_C_INCLUDES += bionic bionic/libstdc++/include external/stlport/stlport

LOCAL_SHARED_LIBRARIES += libstlport

endif

LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_NATIVE_TESTS)/$(LOCAL_MODULE)

include external/stlport/libstlport.mk

include $(BUILD_EXECUTABLE)



# -----------------------------------------------------------------------------

libutils/tests/Android.mk

+0 −6
Original line number Diff line number Diff line 
# Build the unit tests.

LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)



# Build the unit tests.

test_src_files := \
@@ -18,11 +17,6 @@ shared_libraries := \ 
    liblog \

    libcutils \

    libutils \

    libstlport



static_libraries := \

    libgtest \

    libgtest_main



$(foreach file,$(test_src_files), \

    $(eval include $(CLEAR_VARS)) \