diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2016-05-25 13:19:49 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2016-06-01 13:41:23 -0700 |
| commit | ee2da03e2666dcb01721b55aa4767e371120f4fb (patch) | |
| tree | b628830902bfb84f00c39cb391971e608a640252 /libnativebridge | |
| parent | 58ea31cc9013b8aab168cb828571ffc44721d9ef (diff) | |
| download | system_core-ee2da03e2666dcb01721b55aa4767e371120f4fb.tar.gz system_core-ee2da03e2666dcb01721b55aa4767e371120f4fb.tar.bz2 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) 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) |