diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-26 20:37:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-26 20:37:56 +0000 |
| commit | 8372b6c4430169593c20082e209fd7e5ed777655 (patch) | |
| tree | 8723a3977d6ddf554f9907625668bbaf3e736d54 | |
| parent | 5b46587dc87803ceff90377681f9c023b50aee56 (diff) | |
| parent | eeec7e064dc8dabe746fdd121911b72835e964b5 (diff) | |
| download | sfntly-l-preview.tar.gz | |
Merge "Don't manually link stlport."android-l-preview_r2l-preview
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -2,6 +2,7 @@ BASE_PATH := $(call my-dir) LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk # We default to release for the Android build system. Developers debugging # code can build with "Debug" @@ -276,14 +277,13 @@ LOCAL_LDFLAGS_Release := \ LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) LOCAL_STATIC_LIBRARIES := +LOCAL_CXX_STL := stlport # Enable grouping to fix circular references LOCAL_GROUP_STATIC_LIBRARIES := true LOCAL_SHARED_LIBRARIES := \ - libstlport \ libdl \ -include external/stlport/libstlport.mk include $(BUILD_STATIC_LIBRARY) |