diff options
author | Dan Willemsen | 2016-05-25 15:19:49 -0500 |
---|---|---|
committer | Dan Willemsen | 2016-06-01 15:41:23 -0500 |
commit | ee2da03e2666dcb01721b55aa4767e371120f4fb (patch) | |
tree | b628830902bfb84f00c39cb391971e608a640252 /libnativebridge | |
parent | 58ea31cc9013b8aab168cb828571ffc44721d9ef (diff) | |
download | platform-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 'libnativebridge')
-rw-r--r-- | libnativebridge/Android.mk | 3 | ||||
-rw-r--r-- | libnativebridge/tests/Android.nativebridge-dummy.mk | 4 |
2 files changed, 3 insertions, 4 deletions
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) | |||
10 | LOCAL_MODULE:= libnativebridge | 10 | LOCAL_MODULE:= libnativebridge |
11 | 11 | ||
12 | LOCAL_SRC_FILES:= $(NATIVE_BRIDGE_COMMON_SRC_FILES) | 12 | LOCAL_SRC_FILES:= $(NATIVE_BRIDGE_COMMON_SRC_FILES) |
13 | LOCAL_SHARED_LIBRARIES := liblog | 13 | LOCAL_SHARED_LIBRARIES := liblog libdl |
14 | LOCAL_CLANG := true | 14 | LOCAL_CLANG := true |
15 | LOCAL_CPP_EXTENSION := .cc | 15 | LOCAL_CPP_EXTENSION := .cc |
16 | LOCAL_CFLAGS += -Werror -Wall | 16 | LOCAL_CFLAGS += -Werror -Wall |
17 | LOCAL_CPPFLAGS := -std=gnu++11 -fvisibility=protected | 17 | LOCAL_CPPFLAGS := -std=gnu++11 -fvisibility=protected |
18 | LOCAL_LDFLAGS := -ldl | ||
19 | LOCAL_MULTILIB := both | 18 | LOCAL_MULTILIB := both |
20 | 19 | ||
21 | include $(BUILD_SHARED_LIBRARY) | 20 | 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) | |||
13 | LOCAL_CLANG := true | 13 | LOCAL_CLANG := true |
14 | LOCAL_CFLAGS += -Werror -Wall | 14 | LOCAL_CFLAGS += -Werror -Wall |
15 | LOCAL_CPPFLAGS := -std=gnu++11 -fvisibility=protected | 15 | LOCAL_CPPFLAGS := -std=gnu++11 -fvisibility=protected |
16 | LOCAL_LDFLAGS := -ldl | 16 | LOCAL_SHARED_LIBRARIES := libdl |
17 | LOCAL_MULTILIB := both | 17 | LOCAL_MULTILIB := both |
18 | 18 | ||
19 | include $(BUILD_SHARED_LIBRARY) | 19 | include $(BUILD_SHARED_LIBRARY) |
@@ -49,7 +49,7 @@ LOCAL_SRC_FILES:= $(NATIVE_BRIDGE2_COMMON_SRC_FILES) | |||
49 | LOCAL_CLANG := true | 49 | LOCAL_CLANG := true |
50 | LOCAL_CFLAGS += -Werror -Wall | 50 | LOCAL_CFLAGS += -Werror -Wall |
51 | LOCAL_CPPFLAGS := -std=gnu++11 -fvisibility=protected | 51 | LOCAL_CPPFLAGS := -std=gnu++11 -fvisibility=protected |
52 | LOCAL_LDFLAGS := -ldl | 52 | LOCAL_SHARED_LIBRARIES := libdl |
53 | LOCAL_MULTILIB := both | 53 | LOCAL_MULTILIB := both |
54 | 54 | ||
55 | include $(BUILD_SHARED_LIBRARY) | 55 | include $(BUILD_SHARED_LIBRARY) |