From eaff30744e7961dfa304368f81cb56cc4166f495 Mon Sep 17 00:00:00 2001
From: Jack Palevich <jackpal@google.com>
Date: Tue, 26 May 2009 17:23:34 -0700
Subject: [PATCH] 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.
---
 libs/rs/Android.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/libs/rs/Android.mk b/libs/rs/Android.mk
index 83d3d66b6141c..108836fe3af20 100644
--- a/libs/rs/Android.mk
+++ b/libs/rs/Android.mk
@@ -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)