Update makefiles after merge of Chromium at r203688
This commit was generated by merge_from_chromium.py.
Change-Id: Ifcd4dab0ac135556b95062f09fad065d8903b9d9
diff --git a/ots.target.linux-arm.mk b/ots.target.linux-arm.mk
index 291d5d2..0cbd1fe 100644
--- a/ots.target.linux-arm.mk
+++ b/ots.target.linux-arm.mk
@@ -51,7 +51,8 @@
third_party/ots/src/vdmx.cc \
third_party/ots/src/vhea.cc \
third_party/ots/src/vmtx.cc \
- third_party/ots/src/vorg.cc
+ third_party/ots/src/vorg.cc \
+ third_party/ots/src/woff2.cc
# Flags passed to both C and C++ files.
@@ -116,7 +117,9 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES := \
+ $(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/ots/include \
+ $(LOCAL_PATH)/third_party/lzma_sdk \
$(LOCAL_PATH)/third_party/zlib \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \