Update fw/rs for Clang 3.5.
Change-Id: I0a9a1b1e61cb435f0102936ad9ffd51599c49e88
diff --git a/cpu_ref/Android.mk b/cpu_ref/Android.mk
index 96d8b07..c7565da 100644
--- a/cpu_ref/Android.mk
+++ b/cpu_ref/Android.mk
@@ -1,7 +1,7 @@
LOCAL_PATH:=$(call my-dir)
-rs_base_CFLAGS := -Werror -Wall -Wno-unused-parameter -Wno-unused-variable
+rs_base_CFLAGS := -Werror -Wall -Wno-unused-parameter -Wno-unused-variable -fno-exceptions
ifeq ($(TARGET_BUILD_PDK), true)
rs_base_CFLAGS += -D__RS_PDK__
endif
@@ -15,6 +15,11 @@
LOCAL_MODULE := libRSCpuRef
LOCAL_MODULE_TARGET_ARCH := arm mips x86 x86_64 arm64
+ifeq ($(HOST_OS), darwin)
+LOCAL_CFLAGS += -no-integrated-as
+LOCAL_ASFLAGS += -no-integrated-as
+endif
+
LOCAL_SRC_FILES:= \
rsCpuCore.cpp \
rsCpuScript.cpp \
@@ -34,8 +39,7 @@
rsCpuIntrinsicResize.cpp \
rsCpuIntrinsicLUT.cpp
-LOCAL_CFLAGS_arm64 += -DARCH_ARM_HAVE_NEON
-LOCAL_CFLAGS_64 += -DFAKE_ARM64_BUILD
+#LOCAL_CFLAGS_arm64 += -DARCH_ARM_HAVE_NEON
LOCAL_ASFLAGS_arm64 += -no-integrated-as
#LOCAL_SRC_FILES_arm64 += \
@@ -71,10 +75,10 @@
rsCpuIntrinsics_x86.c
endif
-LOCAL_SHARED_LIBRARIES += libRS libcutils libutils liblog libsync
+LOCAL_SHARED_LIBRARIES += libRS libcutils libutils liblog libsync libc++
# these are not supported in 64-bit yet
-LOCAL_SHARED_LIBRARIES_32 += libbcc libbcinfo
+LOCAL_SHARED_LIBRARIES += libbcc libbcinfo
LOCAL_C_INCLUDES += frameworks/compile/libbcc/include