Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the simulator build by removing librs_jni and libRS from it.

Browse Source 
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.
This commit is contained in:
Marco Nelissen
2009-08-12 09:41:07 -07:00
parent e94aaecc5f
commit 3f8f9da85f
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
graphics/jni/Android.mk
View File

@@ -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

7
libs/rs/Android.mk
View File

@@ -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