Merge "Move rs/scriptc to rs/script_api/include." am: a3ab4cc9c9
am: d9bfeff242
am: 235123a821
am: 128cebe6fe
Change-Id: I701bc6cb7cadb16d770b77e4a161994de278e142
This commit is contained in:
commit
8471aa9d46
|
@ -788,7 +788,7 @@ renderscript_flags += -m$(my_32_64_bit_suffix)
|
|||
|
||||
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),)
|
||||
|
|
|
@ -196,7 +196,7 @@ LOCAL_RENDERSCRIPT_INCLUDES := \
|
|||
else
|
||||
LOCAL_RENDERSCRIPT_INCLUDES := \
|
||||
$(TOPDIR)external/clang/lib/Headers \
|
||||
$(TOPDIR)frameworks/rs/scriptc \
|
||||
$(TOPDIR)frameworks/rs/script_api/include \
|
||||
$(LOCAL_RENDERSCRIPT_INCLUDES)
|
||||
endif
|
||||
|
||||
|
|
Loading…
Reference in New Issue