summaryrefslogtreecommitdiff
path: root/ndk
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-06-09 14:51:24 -0700
committerElliott Hughes <enh@google.com>2014-06-09 14:51:24 -0700
commitcbe970b82afce506565bd83b589e49a9dcb97edf (patch)
tree8df2627c39089fc4150f0e52bb28b8f0bbe44a60 /ndk
parentecfe9d094677cc5fc9e04b8681893f78a87926f1 (diff)
Fix build by removing libportable from the default build.
Easier than working out how to fix the fenv stuf... Change-Id: Id457d4fcd790b1fc13047cba29c7d47118196a87
Diffstat (limited to 'ndk')
-rw-r--r--ndk/sources/android/libportable/Android.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/ndk/sources/android/libportable/Android.mk b/ndk/sources/android/libportable/Android.mk
index 1ad844073..6c52e894c 100644
--- a/ndk/sources/android/libportable/Android.mk
+++ b/ndk/sources/android/libportable/Android.mk
@@ -16,6 +16,8 @@
LOCAL_PATH := $(call my-dir)
+ifeq ($(BUILD_LIBPORTABLE_TOO),true)
+
#=====================================================================
# Device Shared Library libportable
#=====================================================================
@@ -42,3 +44,5 @@ LOCAL_WHOLE_STATIC_LIBRARIES += cpufeatures
LOCAL_SHARED_LIBRARIES += liblog libdl
include $(BUILD_SHARED_LIBRARY)
+
+endif # BUILD_LIBPORTABLE_TOO