summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2014-09-26 14:30:26 -0700
committerDan Albert <danalbert@google.com>2014-09-26 14:30:26 -0700
commitb5fdd38e55ba53907a006b4f7ce5bb5e50e1cb4e (patch)
tree08bc21e35190a13532aaf3645dd5a5f7023dfcc5
parent3b8ac3320cf35b5701a1e01d7ff72f450de2b184 (diff)
downloadchromium-b5fdd38e55ba53907a006b4f7ce5bb5e50e1cb4e.tar.gz
Don't manually link stlport.
Change-Id: Ibddc5c0f33ecc30c3653a4ad96086123656b414e
-rw-r--r--Android.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 905df73a..15fe9306 100644
--- a/Android.mk
+++ b/Android.mk
@@ -7,6 +7,7 @@ include external/chromium/third_party/modp_b64/Android.mk
include external/chromium/base/third_party/dmg_fp/Android.mk
include $(CLEAR_VARS)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_CPP_EXTENSION := .cc
@@ -481,7 +482,7 @@ LOCAL_C_INCLUDES := \
$(LOCAL_C_INCLUDES)
LOCAL_STATIC_LIBRARIES := libevent modp_b64 dmg_fp
-LOCAL_SHARED_LIBRARIES := libstlport libexpat libcrypto libssl libz libicuuc libicui18n libsqlite libcutils liblog libdl
+LOCAL_SHARED_LIBRARIES := libexpat libcrypto libssl libz libicuuc libicui18n libsqlite libcutils liblog libdl
# Including this will modify the include path
include external/stlport/libstlport.mk