diff options
author | Dan Albert <danalbert@google.com> | 2014-09-26 22:16:18 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-26 22:16:18 +0000 |
commit | 2a8d00c9ce7472f1ab6279caa35d97dadafea58f (patch) | |
tree | 08bc21e35190a13532aaf3645dd5a5f7023dfcc5 | |
parent | 3b8ac3320cf35b5701a1e01d7ff72f450de2b184 (diff) | |
parent | b5fdd38e55ba53907a006b4f7ce5bb5e50e1cb4e (diff) | |
download | chromium-2a8d00c9ce7472f1ab6279caa35d97dadafea58f.tar.gz |
Merge "Don't manually link stlport."
-rw-r--r-- | Android.mk | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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 |