| commit | 19d686ee9340c81c23083fc30bc012f7f6ed5028 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Fri Sep 26 19:39:44 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Sep 26 19:39:44 2014 +0000 |
| tree | 6f26ae24a36fa54777e1136001470742fcb1f02b | |
| parent | 9f93e297ee7df04bf605b9dc1251f7c772c48189 [diff] | |
| parent | b50af2bc6076eb2406922f17df6daff0eb5b6a35 [diff] |
Merge "Don't manually link stlport."
diff --git a/libcutils/tests/Android.mk b/libcutils/tests/Android.mk index 2b3a9ee..76db5b1 100644 --- a/libcutils/tests/Android.mk +++ b/libcutils/tests/Android.mk
@@ -41,9 +41,9 @@ libc \ libcutils \ liblog \ - libstlport_static \ libutils \ +LOCAL_CXX_STL := stlport_static LOCAL_MULTILIB := both LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64