commit 5ba99e45340b8d5380fe957c5b9690931ab649ed
author Alex Sakhartchouk <alexst@google.com> Wed Mar 28 15:09:03 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 28 15:09:03 2012 -0700
tree edfd8c9f49c99f542e8d54d1d0a67a6abb2fb7d4
parent 5f3417f80b84fb809f6be282455a9db76fceaa53
parent e784c1bc4a6a758860047a1017ea9868c115efca

Merge "Moving libRS"

CleanSpec.mk

diff --git a/CleanSpec.mk b/CleanSpec.mk
index 681d71d..9fdd73c 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -50,6 +50,7 @@
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libbcc_sha1_intermediates)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libbcc_sha1.so)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libclcore.bc_intermediates)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libclcore.bc_intermediates)
 
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

lib/ScriptCRT/Android.mk

diff --git a/lib/ScriptCRT/Android.mk b/lib/ScriptCRT/Android.mk
index 2b3e1fc..fc26062 100644
--- a/lib/ScriptCRT/Android.mk
+++ b/lib/ScriptCRT/Android.mk
@@ -63,7 +63,7 @@
     $(addprefix $(intermediates)/, $(clcore_ll_files)))
 
 $(clcore_c_bc_files): PRIVATE_INCLUDES := \
-    frameworks/base/libs/rs/scriptc \
+    frameworks/rs/scriptc \
     external/clang/lib/Headers
 
 $(clcore_c_bc_files): $(intermediates)/%.bc: $(LOCAL_PATH)/%.c  $(clcore_CLANG)