drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix RenderScript JNI code build issue.

Browse Source 
We should not try to build the JNI file until after we have built the
the generated header files that it includes.
This commit is contained in:
Jack Palevich
2009-05-26 17:23:34 -07:00
parent aaf834a284
commit eaff30744e
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/rs/Android.mk
View File

@ -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
@ -62,11 +64,13 @@ GEN := $(addprefix $(intermediates)/, \
rsgApi.cpp \
rsgApiReplay.cpp \
)
$(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)