Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8471aa9d authored by Jean-Luc Brouillet's avatar Jean-Luc Brouillet Committed by android-build-merger
Browse files

Merge "Move rs/scriptc to rs/script_api/include." am: a3ab4cc9 am: d9bfeff2 am: 235123a8 

am: 128cebe6

Change-Id: I701bc6cb7cadb16d770b77e4a161994de278e142
parents 0499d282 128cebe6

core/binary.mk

+1 −1
Original line number Diff line number Diff line
@@ -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),)

core/java.mk

+1 −1
Original line number Diff line number Diff line
@@ -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