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

Commit 522c1d34 authored Sep 12, 2014 by Dan Albert Committed by Android Git Automerger Sep 12, 2014

am e18ed89e: Merge "Remove makefile cruft."

* commit 'e18ed89e':
  Remove makefile cruft.

parents 209dc083 e18ed89e

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)) \