Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b43aefba authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

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.
parents f2c9b2c0 3f8f9da8

graphics/jni/Android.mk

+7 −0
Original line number Original line Diff line number Diff line 




# 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)

LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)

include $(CLEAR_VARS)
@@ -36,3 +42,4 @@ LOCAL_REQUIRED_MODULES := libRS 




include $(BUILD_SHARED_LIBRARY)

include $(BUILD_SHARED_LIBRARY)





endif #simulator

libs/rs/Android.mk

+7 −0
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ RSG_GENERATOR:=$(LOCAL_BUILT_MODULE) 








# Build render script lib ====================

# Build render script lib ====================



include $(CLEAR_VARS)

include $(CLEAR_VARS)

LOCAL_MODULE := libRS

LOCAL_MODULE := libRS
@@ -67,6 +68,11 @@ rs_generated_source += $(GEN) 




LOCAL_GENERATED_SOURCES += $(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:= \

LOCAL_SRC_FILES:= \

	rsAdapter.cpp \

	rsAdapter.cpp \

	rsAllocation.cpp \

	rsAllocation.cpp \
@@ -106,3 +112,4 @@ include $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk,\ 
            java \

            java \

    	))

    	))





endif #simulator