summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Willemsen2016-05-25 15:19:49 -0500
committerDan Willemsen2016-06-01 15:41:23 -0500
commitee2da03e2666dcb01721b55aa4767e371120f4fb (patch)
treeb628830902bfb84f00c39cb391971e608a640252 /toolbox
parent58ea31cc9013b8aab168cb828571ffc44721d9ef (diff)
downloadplatform-system-core-ee2da03e2666dcb01721b55aa4767e371120f4fb.tar.gz
platform-system-core-ee2da03e2666dcb01721b55aa4767e371120f4fb.tar.xz
platform-system-core-ee2da03e2666dcb01721b55aa4767e371120f4fb.zip
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
Diffstat (limited to 'toolbox')
-rw-r--r--toolbox/Android.mk5
1 files changed, 4 insertions, 1 deletions
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)
3 3
4common_cflags := \ 4common_cflags := \
5 -Werror -Wno-unused-parameter -Wno-unused-const-variable \ 5 -Werror -Wno-unused-parameter -Wno-unused-const-variable \
6 -I$(LOCAL_PATH)/upstream-netbsd/include/ \
7 -include bsd-compatibility.h \ 6 -include bsd-compatibility.h \
8 7
9 8
@@ -21,6 +20,7 @@ LOCAL_SRC_FILES := \
21 upstream-netbsd/lib/libc/string/swab.c \ 20 upstream-netbsd/lib/libc/string/swab.c \
22 upstream-netbsd/lib/libutil/raise_default_signal.c 21 upstream-netbsd/lib/libutil/raise_default_signal.c
23LOCAL_CFLAGS += $(common_cflags) -Dmain=dd_main -DNO_CONV 22LOCAL_CFLAGS += $(common_cflags) -Dmain=dd_main -DNO_CONV
23LOCAL_C_INCLUDES += $(LOCAL_PATH)/upstream-netbsd/include/
24LOCAL_MODULE := libtoolbox_dd 24LOCAL_MODULE := libtoolbox_dd
25include $(BUILD_STATIC_LIBRARY) 25include $(BUILD_STATIC_LIBRARY)
26 26
@@ -49,6 +49,7 @@ LOCAL_SRC_FILES := \
49 $(patsubst %,%.c,$(OUR_TOOLS)) \ 49 $(patsubst %,%.c,$(OUR_TOOLS)) \
50 50
51LOCAL_CFLAGS += $(common_cflags) 51LOCAL_CFLAGS += $(common_cflags)
52LOCAL_C_INCLUDES += $(LOCAL_PATH)/upstream-netbsd/include/
52LOCAL_CONLYFLAGS += -std=gnu99 53LOCAL_CONLYFLAGS += -std=gnu99
53 54
54LOCAL_SHARED_LIBRARIES := \ 55LOCAL_SHARED_LIBRARIES := \
@@ -95,6 +96,7 @@ $(INPUT_H_LABELS_H):
95include $(CLEAR_VARS) 96include $(CLEAR_VARS)
96LOCAL_SRC_FILES := r.c 97LOCAL_SRC_FILES := r.c
97LOCAL_CFLAGS += $(common_cflags) 98LOCAL_CFLAGS += $(common_cflags)
99LOCAL_C_INCLUDES += $(LOCAL_PATH)/upstream-netbsd/include/
98LOCAL_MODULE := r 100LOCAL_MODULE := r
99LOCAL_MODULE_TAGS := debug 101LOCAL_MODULE_TAGS := debug
100include $(BUILD_EXECUTABLE) 102include $(BUILD_EXECUTABLE)
@@ -109,6 +111,7 @@ LOCAL_SRC_FILES := \
109 upstream-netbsd/usr.bin/grep/queue.c \ 111 upstream-netbsd/usr.bin/grep/queue.c \
110 upstream-netbsd/usr.bin/grep/util.c 112 upstream-netbsd/usr.bin/grep/util.c
111LOCAL_CFLAGS += $(common_cflags) 113LOCAL_CFLAGS += $(common_cflags)
114LOCAL_C_INCLUDES += $(LOCAL_PATH)/upstream-netbsd/include/
112LOCAL_MODULE := grep 115LOCAL_MODULE := grep
113LOCAL_POST_INSTALL_CMD := $(hide) $(foreach t,egrep fgrep,ln -sf grep $(TARGET_OUT)/bin/$(t);) 116LOCAL_POST_INSTALL_CMD := $(hide) $(foreach t,egrep fgrep,ln -sf grep $(TARGET_OUT)/bin/$(t);)
114include $(BUILD_EXECUTABLE) 117include $(BUILD_EXECUTABLE)