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

Commit ed43be39 authored Apr 02, 2015 by Elliott Hughes Committed by Gerrit Code Review Apr 02, 2015

Merge "Remove LOCAL_ADDITIONAL_DEPENDENCIES in cases where it's not needed."

parents 21593186 bcc2b5f4

adb/Android.mk

+0 −3

Original line number	Diff line number	Diff line
		@@ -161,7 +161,6 @@ ifeq ($(USE_SYSDEPS_WIN32),)
		LOCAL_STATIC_LIBRARIES += libcutils
		endif

		LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
		include $(BUILD_HOST_EXECUTABLE)

		$(call dist-for-goals,dist_files sdk,$(LOCAL_BUILT_MODULE))
		@@ -221,6 +220,4 @@ LOCAL_STATIC_LIBRARIES := \
		libselinux \
		libext4_utils_static \

		LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

		include $(BUILD_EXECUTABLE)

libion/tests/Android.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@ LOCAL_PATH:= $(call my-dir)

		include $(CLEAR_VARS)
		LOCAL_MODULE := ion-unit-tests
		LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
		LOCAL_CFLAGS += -g -Wall -Werror -std=gnu++11 -Wno-missing-field-initializers
		LOCAL_SHARED_LIBRARIES += libion
		LOCAL_C_INCLUDES := $(LOCAL_PATH)/../kernel-headers

liblog/tests/Android.mk

+0 −2

Original line number	Diff line number	Diff line
		@@ -39,7 +39,6 @@ benchmark_src_files := \
		include $(CLEAR_VARS)
		LOCAL_MODULE := $(test_module_prefix)benchmarks
		LOCAL_MODULE_TAGS := $(test_tags)
		LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
		LOCAL_CFLAGS += $(benchmark_c_flags)
		LOCAL_SHARED_LIBRARIES += liblog libm
		LOCAL_SRC_FILES := $(benchmark_src_files)
		@@ -77,7 +76,6 @@ endif
		include $(CLEAR_VARS)
		LOCAL_MODULE := $(test_module_prefix)unit-tests
		LOCAL_MODULE_TAGS := $(test_tags)
		LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
		LOCAL_CFLAGS += $(test_c_flags)
		LOCAL_SHARED_LIBRARIES := liblog
		LOCAL_SRC_FILES := $(test_src_files)

libsync/tests/Android.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ LOCAL_PATH:= $(call my-dir)
		include $(CLEAR_VARS)
		LOCAL_CLANG := true
		LOCAL_MODULE := sync-unit-tests
		LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
		LOCAL_CFLAGS += -g -Wall -Werror -std=gnu++11 -Wno-missing-field-initializers -Wno-sign-compare
		LOCAL_SHARED_LIBRARIES += libsync
		LOCAL_STATIC_LIBRARIES += libgtest_main

libutils/tests/Android.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@
		LOCAL_PATH := $(call my-dir)

		include $(CLEAR_VARS)
		LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

		LOCAL_MODULE := libutils_tests