Merge "Add a flag control that PRIVATE libm can be chosen"

This commit is contained in:
Elliott Hughes 2014-06-17 22:25:09 +00:00 committed by Gerrit Code Review
commit b6ca747402

View File

@ -1,3 +1,4 @@
ifneq ($(TARGET_USE_PRIVATE_LIBM),true)
LOCAL_PATH:= $(call my-dir)
# TODO: this comes from from upstream's libc, not libm, but it's an
@ -291,3 +292,4 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_SYSTEM_SHARED_LIBRARIES := libc
LOCAL_WHOLE_STATIC_LIBRARIES := libm
include $(BUILD_SHARED_LIBRARY)
endif