am 73e6c9b3: Merge "Static libc++ is being renamed libc++_static."

* commit '73e6c9b39353807aae80170355ec0b67b7a4ce16':
  Static libc++ is being renamed libc++_static.
This commit is contained in:
Dan Albert 2014-09-29 20:55:26 +00:00 committed by Android Git Automerger
commit 22b9dec925

View File

@ -1165,7 +1165,7 @@ LOCAL_CXX_STL := none
LOCAL_SYSTEM_SHARED_LIBRARIES := LOCAL_SYSTEM_SHARED_LIBRARIES :=
# Only need this for arm since libc++ uses its own unwind code that # Only need this for arm since libc++ uses its own unwind code that
# doesn't mix with the other default unwind code. # 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 LOCAL_ALLOW_UNDEFINED_SYMBOLS := true
# Don't install on release build # Don't install on release build