Fix the simulator build by removing librs_jni and libRS from it.
Since libacc isn't 64-bit clean (it casts pointers to integers),
and so can't be built for the gHardy simulator, everything
that depends on it can't be built for the simulator either, which
means removing libRS and librs_jni.
diff --git a/graphics/jni/Android.mk b/graphics/jni/Android.mk
index a6abd8c..799fcbb 100644
--- a/graphics/jni/Android.mk
+++ b/graphics/jni/Android.mk
@@ -1,4 +1,10 @@
+# libRS needs libacc, which isn't 64-bit clean, and so can't be built
+# for the simulator on gHardy, and therefore libRS needs to be excluded
+# from the simulator as well, and so in turn librs_jni needs to be
+# excluded.
+ifneq ($(TARGET_SIMULATOR),true)
+
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
@@ -36,3 +42,4 @@
include $(BUILD_SHARED_LIBRARY)
+endif #simulator
diff --git a/libs/rs/Android.mk b/libs/rs/Android.mk
index 7075842..bc466be 100644
--- a/libs/rs/Android.mk
+++ b/libs/rs/Android.mk
@@ -26,6 +26,7 @@
# Build render script lib ====================
+
include $(CLEAR_VARS)
LOCAL_MODULE := libRS
@@ -67,6 +68,11 @@
LOCAL_GENERATED_SOURCES += $(GEN)
+# libRS needs libacc, which isn't 64-bit clean, and so can't be built
+# for the simulator on gHardy, and therefore libRS needs to be excluded
+# from the simulator as well.
+ifneq ($(TARGET_SIMULATOR),true)
+
LOCAL_SRC_FILES:= \
rsAdapter.cpp \
rsAllocation.cpp \
@@ -106,3 +112,4 @@
java \
))
+endif #simulator