diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-26 19:53:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-26 19:53:04 +0000 |
| commit | 31171b6e3155ac075a37aeb28da1a06faeb15276 (patch) | |
| tree | 2265f5da8c524258a6804b5bea1bba566be38173 /libcutils | |
| parent | a8996fddaa06aa9294be345f41e0955f2f7c745f (diff) | |
| parent | be0d295da912076239a1e112c4b7b94be10cf7af (diff) | |
| download | system_core-31171b6e3155ac075a37aeb28da1a06faeb15276.zip system_core-31171b6e3155ac075a37aeb28da1a06faeb15276.tar.gz system_core-31171b6e3155ac075a37aeb28da1a06faeb15276.tar.bz2 | |
am be0d295d: am 19d686ee: Merge "Don\'t manually link stlport."
* commit 'be0d295da912076239a1e112c4b7b94be10cf7af':
Don't manually link stlport.
Diffstat (limited to 'libcutils')
| -rw-r--r-- | libcutils/tests/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ LOCAL_STATIC_LIBRARIES := \ 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 |