From 196ac850afc2382c901d3866a6e9bd95093893b9 Mon Sep 17 00:00:00 2001
From: Jason Sams <rjsams@android.com>
Date: Wed, 10 Jun 2009 18:35:42 -0700
Subject: [PATCH] Fix build error due to bad path generation in makefile for
 generated tools. Implemented by JoeO

---
 libs/rs/Android.mk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/libs/rs/Android.mk b/libs/rs/Android.mk
index 00aaadd745153..06c059533933e 100644
--- a/libs/rs/Android.mk
+++ b/libs/rs/Android.mk
@@ -50,7 +50,8 @@ GEN := $(addprefix $(intermediates)/, \
             rsgApiFuncDecl.h \
         )
 
-$(GEN) : PRIVATE_CUSTOM_TOOL = $(RSG_GENERATOR) $< $@ <$(LOCAL_PATH)/rs.spec
+$(GEN) : PRIVATE_PATH := $(LOCAL_PATH)
+$(GEN) : PRIVATE_CUSTOM_TOOL = $(RSG_GENERATOR) $< $@ <$(PRIVATE_PATH)/rs.spec
 $(GEN) : $(RSG_GENERATOR) $(LOCAL_PATH)/rs.spec
 $(GEN): $(intermediates)/%.h : $(LOCAL_PATH)/%.h.rsg
 	$(transform-generated-source)
@@ -66,13 +67,15 @@ GEN := $(addprefix $(intermediates)/, \
             rsgApiReplay.cpp \
         )
 
-$(GEN) : PRIVATE_CUSTOM_TOOL = $(RSG_GENERATOR) $< $@ <$(LOCAL_PATH)/rs.spec
+$(GEN) : PRIVATE_PATH := $(LOCAL_PATH)
+$(GEN) : PRIVATE_CUSTOM_TOOL = $(RSG_GENERATOR) $< $@ <$(PRIVATE_PATH)/rs.spec
 $(GEN) : $(RSG_GENERATOR) $(LOCAL_PATH)/rs.spec
 $(GEN): $(intermediates)/%.cpp : $(LOCAL_PATH)/%.cpp.rsg
 	$(transform-generated-source)
 
 # used in jni/Android.mk
 rs_generated_source += $(GEN)
+
 LOCAL_GENERATED_SOURCES += $(GEN)
 
 LOCAL_SRC_FILES:= \
@@ -105,7 +108,6 @@ LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_SHARED_LIBRARY)
 
-
 # Include the subdirectories ====================
 include $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk,\
             jni \