StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move rs/scriptc to rs/script_api/include." am: a3ab4cc9c9

Browse Source 
am: d9bfeff242

Change-Id: I0249452861ffd748200c02434674832a2303b20b
This commit is contained in:
Jean-Luc Brouillet
2017-01-11 02:17:59 +00:00
committed by android-build-merger
parent d1f4fc175e d9bfeff242
commit 235123a821
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/binary.mk
View File

@@ -788,7 +788,7 @@ renderscript_flags += -m$(my_32_64_bit_suffix)
renderscript_includes := \ renderscript_includes := \
$(TOPDIR)external/clang/lib/Headers \ $(TOPDIR)external/clang/lib/Headers \
$(TOPDIR)frameworks/rs/scriptc \ $(TOPDIR)frameworks/rs/script_api/include \
$(LOCAL_RENDERSCRIPT_INCLUDES) $(LOCAL_RENDERSCRIPT_INCLUDES)
ifneq ($(LOCAL_RENDERSCRIPT_INCLUDES_OVERRIDE),) ifneq ($(LOCAL_RENDERSCRIPT_INCLUDES_OVERRIDE),)

2
core/java.mk
View File

@@ -192,7 +192,7 @@ LOCAL_RENDERSCRIPT_INCLUDES := \
else else
LOCAL_RENDERSCRIPT_INCLUDES := \ LOCAL_RENDERSCRIPT_INCLUDES := \
$(TOPDIR)external/clang/lib/Headers \ $(TOPDIR)external/clang/lib/Headers \
$(TOPDIR)frameworks/rs/scriptc \ $(TOPDIR)frameworks/rs/script_api/include \
$(LOCAL_RENDERSCRIPT_INCLUDES) $(LOCAL_RENDERSCRIPT_INCLUDES)
endif endif