commit 60aa3eaf559b1410898c228e4f6ab7920f3953d0
author Jack Palevich <jackpal@google.com> Tue May 26 13:45:08 2009 -0700
committer Jack Palevich <jackpal@google.com> Tue May 26 13:45:08 2009 -0700
tree 40b525a378a1d9b1c79a2e8f31c46f8b69b74673
parent aaafa4fb1cda4dd4e1a261a1c196865ac0a14105

Add sprite fountain test.

It's still called "Calc".

libs/rs/Android.mk

diff --git a/libs/rs/Android.mk b/libs/rs/Android.mk
index 73c1eea..83d3d66 100644
--- a/libs/rs/Android.mk
+++ b/libs/rs/Android.mk
@@ -2,9 +2,9 @@
 ifeq ($(BUILD_RENDERSCRIPT),true)
 
 TOP_LOCAL_PATH:=$(call my-dir)
+include $(CLEAR_VARS)
 LOCAL_PATH:= $(TOP_LOCAL_PATH)
 
-
 # Build rsg-generator
 
 LOCAL_MODULE := rsg-generator
@@ -50,7 +50,7 @@
             rsgApiFuncDecl.h \
         )
 
-$(GEN) : PRIVATE_CUSTOM_TOOL = $(RSG_GENERATOR) $< $@ <$(LOCAL_PATH)/rs.spec
+$(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)
@@ -63,7 +63,7 @@
             rsgApiReplay.cpp \
         )
         
-$(GEN) : PRIVATE_CUSTOM_TOOL = $(RSG_GENERATOR) $< $@ <$(LOCAL_PATH)/rs.spec
+$(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)
@@ -129,4 +129,5 @@
 
 include $(BUILD_SHARED_LIBRARY)
 
-endif # BUILD_RENDERSCRIPT
\ No newline at end of file
+include $(call all-subdir-makefiles)
+endif # BUILD_RENDERSCRIPT