Merge from Chromium at DEPS revision 230120
This commit was generated by merge_to_master.py.
Change-Id: I54bc06b7ee8a07092e74ce3b68c6893508349042
diff --git a/skia/skia_opts_neon.target.darwin-arm.mk b/skia/skia_opts_neon.target.darwin-arm.mk
index a87fc5b..bb974a0 100644
--- a/skia/skia_opts_neon.target.darwin-arm.mk
+++ b/skia/skia_opts_neon.target.darwin-arm.mk
@@ -26,7 +26,8 @@
third_party/skia/src/opts/memset32_neon.S \
third_party/skia/src/opts/SkBitmapProcState_arm_neon.cpp \
third_party/skia/src/opts/SkBitmapProcState_matrixProcs_neon.cpp \
- third_party/skia/src/opts/SkBlitRow_opts_arm_neon.cpp
+ third_party/skia/src/opts/SkBlitRow_opts_arm_neon.cpp \
+ third_party/skia/src/opts/SkXfermode_opts_arm_neon.cpp
# Flags passed to both C and C++ files.
@@ -94,11 +95,11 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(LOCAL_PATH) \
- $(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
$(LOCAL_PATH)/third_party/skia/src/opts \
+ $(LOCAL_PATH) \
+ $(LOCAL_PATH)/skia/config \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
$(PWD)/external/stlport/stlport
@@ -182,11 +183,11 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(LOCAL_PATH) \
- $(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
$(LOCAL_PATH)/third_party/skia/src/opts \
+ $(LOCAL_PATH) \
+ $(LOCAL_PATH)/skia/config \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
$(PWD)/external/stlport/stlport