diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-12 18:07:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-12 18:07:26 +0000 |
| commit | e18ed89eae41f9be0f4ddfc77a3c4d68c901925f (patch) | |
| tree | 3ab317e087047fa966535f0835a675b193e9fe5b | |
| parent | 870cac615884f9c843407b8bb442eb4d6714f6e2 (diff) | |
| parent | fbb8db2e2a885073812ca3975f68a90f9a837391 (diff) | |
| download | system_core-e18ed89eae41f9be0f4ddfc77a3c4d68c901925f.zip system_core-e18ed89eae41f9be0f4ddfc77a3c4d68c901925f.tar.gz system_core-e18ed89eae41f9be0f4ddfc77a3c4d68c901925f.tar.bz2 | |
Merge "Remove makefile cruft."
| -rw-r--r-- | libcutils/tests/Android.mk | 2 | ||||
| -rw-r--r-- | liblog/tests/Android.mk | 5 | ||||
| -rw-r--r-- | libutils/tests/Android.mk | 6 |
3 files changed, 3 insertions, 10 deletions
diff --git a/libcutils/tests/Android.mk b/libcutils/tests/Android.mk index 8e65310..2b3a9ee 100644 --- a/libcutils/tests/Android.mk +++ b/libcutils/tests/Android.mk @@ -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) diff --git a/liblog/tests/Android.mk b/liblog/tests/Android.mk index 615a657..b1426d3 100644 --- a/liblog/tests/Android.mk +++ b/liblog/tests/Android.mk @@ -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) # ----------------------------------------------------------------------------- diff --git a/libutils/tests/Android.mk b/libutils/tests/Android.mk index caedaff..ab03d87 100644 --- a/libutils/tests/Android.mk +++ b/libutils/tests/Android.mk @@ -1,6 +1,5 @@ # 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)) \ |