From ee2da03e2666dcb01721b55aa4767e371120f4fb Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Wed, 25 May 2016 13:19:49 -0700 Subject: [PATCH] Remove invalid uses of -l and -I LOCAL_LDLIBS should only be used with -l flags for NDK and some host libraries. Other uses should use LOCAL_SHARED_LIBRARIES. LOCAL_LDFLAGS should not contain -l entries, they should be in LOCAL_LDLIBS instead. LOCAL_CFLAGS should not contain -I entries, those should use LOCAL_C_INCLUDES instead. Change-Id: Ic901aa14651572ac682166becd4f0cd86baecc34 --- libbacktrace/Android.mk | 4 +++- libnativebridge/Android.mk | 3 +-- libnativebridge/tests/Android.nativebridge-dummy.mk | 4 ++-- libnativeloader/Android.mk | 3 +-- toolbox/Android.mk | 5 ++++- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk index 632b1b66b..356ab8bcc 100644 --- a/libbacktrace/Android.mk +++ b/libbacktrace/Android.mk @@ -25,7 +25,9 @@ libbacktrace_common_conlyflags := \ libbacktrace_common_cppflags := \ -std=gnu++11 \ - -I external/libunwind/include/tdep \ + +libbacktrace_common_c_includes := \ + external/libunwind/include/tdep \ # The latest clang (r230699) does not allow SP/PC to be declared in inline asm lists. libbacktrace_common_clang_cflags += \ diff --git a/libnativebridge/Android.mk b/libnativebridge/Android.mk index d20d44cc2..b88621e7d 100644 --- a/libnativebridge/Android.mk +++ b/libnativebridge/Android.mk @@ -10,12 +10,11 @@ include $(CLEAR_VARS) LOCAL_MODULE:= libnativebridge LOCAL_SRC_FILES:= $(NATIVE_BRIDGE_COMMON_SRC_FILES) -LOCAL_SHARED_LIBRARIES := liblog +LOCAL_SHARED_LIBRARIES := liblog libdl LOCAL_CLANG := true LOCAL_CPP_EXTENSION := .cc LOCAL_CFLAGS += -Werror -Wall LOCAL_CPPFLAGS := -std=gnu++11 -fvisibility=protected -LOCAL_LDFLAGS := -ldl LOCAL_MULTILIB := both include $(BUILD_SHARED_LIBRARY) diff --git a/libnativebridge/tests/Android.nativebridge-dummy.mk b/libnativebridge/tests/Android.nativebridge-dummy.mk index 2efc17659..551765a39 100644 --- a/libnativebridge/tests/Android.nativebridge-dummy.mk +++ b/libnativebridge/tests/Android.nativebridge-dummy.mk @@ -13,7 +13,7 @@ LOCAL_SRC_FILES:= $(NATIVE_BRIDGE_COMMON_SRC_FILES) LOCAL_CLANG := true LOCAL_CFLAGS += -Werror -Wall LOCAL_CPPFLAGS := -std=gnu++11 -fvisibility=protected -LOCAL_LDFLAGS := -ldl +LOCAL_SHARED_LIBRARIES := libdl LOCAL_MULTILIB := both include $(BUILD_SHARED_LIBRARY) @@ -49,7 +49,7 @@ LOCAL_SRC_FILES:= $(NATIVE_BRIDGE2_COMMON_SRC_FILES) LOCAL_CLANG := true LOCAL_CFLAGS += -Werror -Wall LOCAL_CPPFLAGS := -std=gnu++11 -fvisibility=protected -LOCAL_LDFLAGS := -ldl +LOCAL_SHARED_LIBRARIES := libdl LOCAL_MULTILIB := both include $(BUILD_SHARED_LIBRARY) diff --git a/libnativeloader/Android.mk b/libnativeloader/Android.mk index 632c6c8dc..c81c67111 100644 --- a/libnativeloader/Android.mk +++ b/libnativeloader/Android.mk @@ -12,12 +12,11 @@ include $(CLEAR_VARS) LOCAL_MODULE:= libnativeloader LOCAL_SRC_FILES:= $(native_loader_common_src_files) -LOCAL_SHARED_LIBRARIES := libnativehelper liblog libcutils +LOCAL_SHARED_LIBRARIES := libnativehelper liblog libcutils libdl LOCAL_STATIC_LIBRARIES := libbase LOCAL_CLANG := true LOCAL_CFLAGS := $(native_loader_common_cflags) LOCAL_CPPFLAGS := -std=gnu++14 -fvisibility=hidden -LOCAL_LDFLAGS := -ldl LOCAL_MULTILIB := both LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_C_INCLUDES := $(LOCAL_PATH)/include diff --git a/toolbox/Android.mk b/toolbox/Android.mk index d151ad6bc..ba04364b3 100644 --- a/toolbox/Android.mk +++ b/toolbox/Android.mk @@ -3,7 +3,6 @@ LOCAL_PATH:= $(call my-dir) common_cflags := \ -Werror -Wno-unused-parameter -Wno-unused-const-variable \ - -I$(LOCAL_PATH)/upstream-netbsd/include/ \ -include bsd-compatibility.h \ @@ -21,6 +20,7 @@ LOCAL_SRC_FILES := \ upstream-netbsd/lib/libc/string/swab.c \ upstream-netbsd/lib/libutil/raise_default_signal.c LOCAL_CFLAGS += $(common_cflags) -Dmain=dd_main -DNO_CONV +LOCAL_C_INCLUDES += $(LOCAL_PATH)/upstream-netbsd/include/ LOCAL_MODULE := libtoolbox_dd include $(BUILD_STATIC_LIBRARY) @@ -49,6 +49,7 @@ LOCAL_SRC_FILES := \ $(patsubst %,%.c,$(OUR_TOOLS)) \ LOCAL_CFLAGS += $(common_cflags) +LOCAL_C_INCLUDES += $(LOCAL_PATH)/upstream-netbsd/include/ LOCAL_CONLYFLAGS += -std=gnu99 LOCAL_SHARED_LIBRARIES := \ @@ -95,6 +96,7 @@ $(INPUT_H_LABELS_H): include $(CLEAR_VARS) LOCAL_SRC_FILES := r.c LOCAL_CFLAGS += $(common_cflags) +LOCAL_C_INCLUDES += $(LOCAL_PATH)/upstream-netbsd/include/ LOCAL_MODULE := r LOCAL_MODULE_TAGS := debug include $(BUILD_EXECUTABLE) @@ -109,6 +111,7 @@ LOCAL_SRC_FILES := \ upstream-netbsd/usr.bin/grep/queue.c \ upstream-netbsd/usr.bin/grep/util.c LOCAL_CFLAGS += $(common_cflags) +LOCAL_C_INCLUDES += $(LOCAL_PATH)/upstream-netbsd/include/ LOCAL_MODULE := grep LOCAL_POST_INSTALL_CMD := $(hide) $(foreach t,egrep fgrep,ln -sf grep $(TARGET_OUT)/bin/$(t);) include $(BUILD_EXECUTABLE)