diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-12 02:57:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-12 02:57:50 +0000 |
| commit | 264f08d8b8a152a9ea2445b05602ea50d90d1f1c (patch) | |
| tree | 70bec9d59a58c630697687dd29a4495301cfdaa6 | |
| parent | b020ad88ca28ada76a596b5dcc7e6c2854fcc132 (diff) | |
| parent | cfe8f656282ce662f383c3442cd2e9c08c4ad046 (diff) | |
| download | ml-264f08d8b8a152a9ea2445b05602ea50d90d1f1c.tar.gz | |
Merge "Don't manually link stlport."android-l-preview_r2l-preview
| -rw-r--r-- | bordeaux/learning/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bordeaux/learning/Android.mk b/bordeaux/learning/Android.mk index 5ebb48af7..ae1098272 100644 --- a/bordeaux/learning/Android.mk +++ b/bordeaux/learning/Android.mk @@ -23,7 +23,7 @@ LOCAL_MODULE_TAGS := samples tests LOCAL_MODULE := libbordeaux LOCAL_WHOLE_STATIC_LIBRARIES := libmulticlass_pa libstochastic_linear -LOCAL_SHARED_LIBRARIES := libstlport libcutils liblog +LOCAL_SHARED_LIBRARIES := libcutils liblog LOCAL_PRELINK_MODULE := false |