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

* commit 'b6ca7474023f7832d4230756781031b7687517e6': Add a flag control that PRIVATE libm can be chosen
2014-06-17 22:42:16 +00:00
parent 775b2a0d9c b6ca747402
commit c02f242d33
1 changed files with 2 additions and 0 deletions
--- a/libm/Android.mk
+++ b/libm/Android.mk
@@ -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