ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am e18ed89e: Merge "Remove makefile cruft."

Browse source 
* commit 'e18ed89eae41f9be0f4ddfc77a3c4d68c901925f':
  Remove makefile cruft.
This commit is contained in:
Dan Albert 2014-09-12 18:49:05 +00:00 • committed by Android Git Automerger
commit 522c1d340b
3 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libcutils/tests/Android.mk
View file

@ -19,6 +19,7 @@ test_src_files := \
PropertiesTest.cpp \ PropertiesTest.cpp \
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_MODULE := libcutils_test LOCAL_MODULE := libcutils_test
LOCAL_SRC_FILES := $(test_src_files) LOCAL_SRC_FILES := $(test_src_files)
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
@ -32,6 +33,7 @@ LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
include $(BUILD_NATIVE_TEST) include $(BUILD_NATIVE_TEST)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_MODULE := libcutils_test_static LOCAL_MODULE := libcutils_test_static
LOCAL_FORCE_STATIC_EXECUTABLE := true LOCAL_FORCE_STATIC_EXECUTABLE := true
LOCAL_SRC_FILES := $(test_src_files) LOCAL_SRC_FILES := $(test_src_files)

5
liblog/tests/Android.mk
View file

@ -43,11 +43,8 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_CFLAGS += $(benchmark_c_flags) LOCAL_CFLAGS += $(benchmark_c_flags)
LOCAL_SHARED_LIBRARIES += liblog libm LOCAL_SHARED_LIBRARIES += liblog libm
LOCAL_SRC_FILES := $(benchmark_src_files) 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) LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_NATIVE_TESTS)/$(LOCAL_MODULE)
include external/stlport/libstlport.mk
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------

6
libutils/tests/Android.mk
View file

@ -1,6 +1,5 @@
# Build the unit tests. # Build the unit tests.
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
# Build the unit tests. # Build the unit tests.
test_src_files := \ test_src_files := \
@ -18,11 +17,6 @@ shared_libraries := \
liblog \ liblog \
libcutils \ libcutils \
libutils \ libutils \
libstlport
static_libraries := \
libgtest \
libgtest_main
$(foreach file,$(test_src_files), \ $(foreach file,$(test_src_files), \
$(eval include $(CLEAR_VARS)) \ $(eval include $(CLEAR_VARS)) \