diff options
| author | 2009-08-12 09:41:07 -0700 | |
|---|---|---|
| committer | 2009-08-12 09:41:07 -0700 | |
| commit | 3f8f9da85f4189bfef68cf13a1b643674b5e0726 (patch) | |
| tree | 0fa44fe4c98dc7e49f8e113c9f883127ddace35e /libs/rs | |
| parent | e94aaecc5f28dc31cae9d8c34c7ae63b4fd7e253 (diff) | |
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.
Diffstat (limited to 'libs/rs')
| -rw-r--r-- | libs/rs/Android.mk | 7 |
1 files changed, 7 insertions, 0 deletions
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 |