diff options
| -rw-r--r-- | graphics/jni/Android.mk | 7 | ||||
| -rw-r--r-- | libs/rs/Android.mk | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/graphics/jni/Android.mk b/graphics/jni/Android.mk index a6abd8ce5187..799fcbb6f971 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 70758425aa60..bc466bedf85b 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 |