diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-12 09:51:56 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-12 09:51:56 -0700 |
| commit | b43aefbab6f5b520e6d63367bcdcdd0561f96322 (patch) | |
| tree | 6b8a8a3bd1c3c360527064bdb6a704d9e20eabb0 | |
| parent | f2c9b2c0b4e4e7df17ca0ff03311ea3f23cc2148 (diff) | |
| parent | 3f8f9da85f4189bfef68cf13a1b643674b5e0726 (diff) | |
| download | frameworks_base-b43aefbab6f5b520e6d63367bcdcdd0561f96322.zip frameworks_base-b43aefbab6f5b520e6d63367bcdcdd0561f96322.tar.gz frameworks_base-b43aefbab6f5b520e6d63367bcdcdd0561f96322.tar.bz2 | |
Merge change 20943
* changes:
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.
| -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 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 @@ LOCAL_REQUIRED_MODULES := libRS 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 @@ 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 |