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

Commit eaff3074 authored by Jack Palevich's avatar Jack Palevich
Browse files

Fix RenderScript JNI code build issue. 

We should not try to build the JNI file until after we have built the
the generated header files that it includes.
parent aaf834a2

libs/rs/Android.mk

+7 −1
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ $(GEN) : PRIVATE_CUSTOM_TOOL = $(RSG_GENERATOR) $< $@ <$(TOP_LOCAL_PATH)/rs.spec 
$(GEN) : $(RSG_GENERATOR) $(LOCAL_PATH)/rs.spec

$(GEN): $(intermediates)/%.h : $(LOCAL_PATH)/%.h.rsg

	$(transform-generated-source)



RS_GENERATED_SOURCES += $(GEN)

LOCAL_GENERATED_SOURCES += $(GEN)



# Generate custom source files
@@ -67,6 +69,8 @@ $(GEN) : PRIVATE_CUSTOM_TOOL = $(RSG_GENERATOR) $< $@ <$(TOP_LOCAL_PATH)/rs.spec 
$(GEN) : $(RSG_GENERATOR) $(LOCAL_PATH)/rs.spec

$(GEN): $(intermediates)/%.cpp : $(LOCAL_PATH)/%.cpp.rsg

	$(transform-generated-source)



RS_GENERATED_SOURCES += $(GEN)

LOCAL_GENERATED_SOURCES += $(GEN)



LOCAL_SRC_FILES:= \
@@ -127,6 +131,8 @@ LOCAL_LDLIBS := -lpthread 


LOCAL_MODULE:= libRS_jni



LOCAL_ADDITIONAL_DEPENDENCIES += $(RS_GENERATED_SOURCES)



include $(BUILD_SHARED_LIBRARY)



include $(call all-subdir-makefiles)