commit 9e3e93e04752d9952fd520e0ddec6a5f135055c2
author Android Chromium Automerger <chromium-automerger@android> Mon Jun 03 09:56:15 2013 +0000
committer Android Chromium Automerger <chromium-automerger@android> Mon Jun 03 09:56:15 2013 +0000
tree e7605175d14aff45d3c397beceaac4717173dd40
parent 0b8f6b3e80e93f8e507ca3fecf465032e93758f7

Update makefiles after merge of Chromium at r203688

This commit was generated by merge_from_chromium.py.

Change-Id: Ifcd4dab0ac135556b95062f09fad065d8903b9d9

ots.target.darwin-x86.mk

diff --git a/ots.target.darwin-x86.mk b/ots.target.darwin-x86.mk
index 1e90866..cdcb011 100644
--- a/ots.target.darwin-x86.mk
+++ b/ots.target.darwin-x86.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.
@@ -118,7 +119,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 \