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

Commit 128cebe6 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

Change-Id: I48ec15a00e4cbc0714d1eb93e73c933e5e531cad
parents 9db3e066 235123a8

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
@@ -192,7 +192,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