| commit | 73e6c9b39353807aae80170355ec0b67b7a4ce16 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Mon Sep 29 16:08:35 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Sep 29 16:08:35 2014 +0000 |
| tree | 9232fecb6c3cdc222fb3629011eabe9fe2f974f0 | |
| parent | 7ca5c4b99b308550e34e185ed632b8a5ad5341ee [diff] | |
| parent | 188d093993b3330b3c22437af8f22352f72ce64b [diff] |
Merge "Static libc++ is being renamed libc++_static."
diff --git a/libc/Android.mk b/libc/Android.mk index fee54a2..8ffaaf3 100644 --- a/libc/Android.mk +++ b/libc/Android.mk
@@ -1165,7 +1165,7 @@ LOCAL_SYSTEM_SHARED_LIBRARIES := # Only need this for arm since libc++ uses its own unwind code that # doesn't mix with the other default unwind code. -LOCAL_STATIC_LIBRARIES_arm := libc++ +LOCAL_STATIC_LIBRARIES_arm := libc++_static LOCAL_ALLOW_UNDEFINED_SYMBOLS := true # Don't install on release build