From 3f8f9da85f4189bfef68cf13a1b643674b5e0726 Mon Sep 17 00:00:00 2001
From: Marco Nelissen <marcone@google.com>
Date: Wed, 12 Aug 2009 09:41:07 -0700
Subject: [PATCH] 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.

---
 graphics/jni/Android.mk | 7 +++++++
 libs/rs/Android.mk      | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/graphics/jni/Android.mk b/graphics/jni/Android.mk
index a6abd8ce51879..799fcbb6f971f 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 @@ LOCAL_REQUIRED_MODULES := libRS
 
 include $(BUILD_SHARED_LIBRARY)
 
+endif #simulator
diff --git a/libs/rs/Android.mk b/libs/rs/Android.mk
index 70758425aa600..bc466bedf85bf 100644
--- a/libs/rs/Android.mk
+++ b/libs/rs/Android.mk
@@ -26,6 +26,7 @@ RSG_GENERATOR:=$(LOCAL_BUILT_MODULE)
 
 
 # Build render script lib ====================
+
 include $(CLEAR_VARS)
 LOCAL_MODULE := libRS
 
@@ -67,6 +68,11 @@ rs_generated_source += $(GEN)
 
 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 @@ include $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk,\
             java \
     	))
 
+endif #simulator