diff options
| author | Elliott Hughes <enh@google.com> | 2014-06-17 22:25:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-17 20:56:23 +0000 |
| commit | b6ca7474023f7832d4230756781031b7687517e6 (patch) | |
| tree | 2a1f4a2d3a5c4fd80cb21e9178b1794d0a2bc1fb | |
| parent | 4ac22649441339d0a81e0fc6428ac7f1867ffe6f (diff) | |
| parent | d97d1ca7d9e514129d0ef07cb39f35b0fc9489b5 (diff) | |
| download | bionic-b6ca7474023f7832d4230756781031b7687517e6.zip bionic-b6ca7474023f7832d4230756781031b7687517e6.tar.gz bionic-b6ca7474023f7832d4230756781031b7687517e6.tar.bz2 | |
Merge "Add a flag control that PRIVATE libm can be chosen"
| -rw-r--r-- | libm/Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libm/Android.mk b/libm/Android.mk index b67395f..90b4906 100644 --- 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 |