commit a3ab4cc9c9c28067e5e010bc728ae330769d2cb3
author Jean-Luc Brouillet <jeanluc@google.com> Wed Jan 11 02:04:15 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 11 02:04:16 2017 +0000
tree 82b210db7ef01cdfd2b827d9a6b4891438eecf7a
parent 2ec742a956997309fd184168ef83a547382aee3a
parent eba449391ecc26ffdc250777a71e253d1038f44a

Merge "Move rs/scriptc to rs/script_api/include."

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index b37ef80..4db3d51 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -788,7 +788,7 @@
 
 renderscript_includes := \
     $(TOPDIR)external/clang/lib/Headers \
-    $(TOPDIR)frameworks/rs/scriptc \
+    $(TOPDIR)frameworks/rs/script_api/include \
     $(LOCAL_RENDERSCRIPT_INCLUDES)
 
 ifneq ($(LOCAL_RENDERSCRIPT_INCLUDES_OVERRIDE),)

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index 8eb30cf..baf097b 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -192,7 +192,7 @@
 else
 LOCAL_RENDERSCRIPT_INCLUDES := \
     $(TOPDIR)external/clang/lib/Headers \
-    $(TOPDIR)frameworks/rs/scriptc \
+    $(TOPDIR)frameworks/rs/script_api/include \
     $(LOCAL_RENDERSCRIPT_INCLUDES)
 endif