Update makefiles after merge of Chromium at 280798
This commit was generated by merge_from_chromium.py.
Change-Id: I4e0521ac15eff30eee9685ce695640c93e96a764
diff --git a/ots.target.darwin-arm.mk b/ots.target.darwin-arm.mk
index c37bae3..5d84ff9 100644
--- a/ots.target.darwin-arm.mk
+++ b/ots.target.darwin-arm.mk
@@ -24,6 +24,8 @@
GYP_COPIED_SOURCE_ORIGIN_DIRS :=
LOCAL_SRC_FILES := \
+ third_party/ots/src/cbdt.cc \
+ third_party/ots/src/cblc.cc \
third_party/ots/src/cff.cc \
third_party/ots/src/cff_type2_charstring.cc \
third_party/ots/src/cmap.cc \
diff --git a/ots.target.darwin-arm64.mk b/ots.target.darwin-arm64.mk
index 7176bd6..87c14b5 100644
--- a/ots.target.darwin-arm64.mk
+++ b/ots.target.darwin-arm64.mk
@@ -24,6 +24,8 @@
GYP_COPIED_SOURCE_ORIGIN_DIRS :=
LOCAL_SRC_FILES := \
+ third_party/ots/src/cbdt.cc \
+ third_party/ots/src/cblc.cc \
third_party/ots/src/cff.cc \
third_party/ots/src/cff_type2_charstring.cc \
third_party/ots/src/cmap.cc \
diff --git a/ots.target.darwin-mips.mk b/ots.target.darwin-mips.mk
index d63f5b9..e28a122 100644
--- a/ots.target.darwin-mips.mk
+++ b/ots.target.darwin-mips.mk
@@ -24,6 +24,8 @@
GYP_COPIED_SOURCE_ORIGIN_DIRS :=
LOCAL_SRC_FILES := \
+ third_party/ots/src/cbdt.cc \
+ third_party/ots/src/cblc.cc \
third_party/ots/src/cff.cc \
third_party/ots/src/cff_type2_charstring.cc \
third_party/ots/src/cmap.cc \
diff --git a/ots.target.darwin-x86.mk b/ots.target.darwin-x86.mk
index 991b3eb..f68873f 100644
--- a/ots.target.darwin-x86.mk
+++ b/ots.target.darwin-x86.mk
@@ -24,6 +24,8 @@
GYP_COPIED_SOURCE_ORIGIN_DIRS :=
LOCAL_SRC_FILES := \
+ third_party/ots/src/cbdt.cc \
+ third_party/ots/src/cblc.cc \
third_party/ots/src/cff.cc \
third_party/ots/src/cff_type2_charstring.cc \
third_party/ots/src/cmap.cc \
diff --git a/ots.target.darwin-x86_64.mk b/ots.target.darwin-x86_64.mk
index d070b3a..6e6a488 100644
--- a/ots.target.darwin-x86_64.mk
+++ b/ots.target.darwin-x86_64.mk
@@ -24,6 +24,8 @@
GYP_COPIED_SOURCE_ORIGIN_DIRS :=
LOCAL_SRC_FILES := \
+ third_party/ots/src/cbdt.cc \
+ third_party/ots/src/cblc.cc \
third_party/ots/src/cff.cc \
third_party/ots/src/cff_type2_charstring.cc \
third_party/ots/src/cmap.cc \
diff --git a/ots.target.linux-arm.mk b/ots.target.linux-arm.mk
index c37bae3..5d84ff9 100644
--- a/ots.target.linux-arm.mk
+++ b/ots.target.linux-arm.mk
@@ -24,6 +24,8 @@
GYP_COPIED_SOURCE_ORIGIN_DIRS :=
LOCAL_SRC_FILES := \
+ third_party/ots/src/cbdt.cc \
+ third_party/ots/src/cblc.cc \
third_party/ots/src/cff.cc \
third_party/ots/src/cff_type2_charstring.cc \
third_party/ots/src/cmap.cc \
diff --git a/ots.target.linux-arm64.mk b/ots.target.linux-arm64.mk
index 7176bd6..87c14b5 100644
--- a/ots.target.linux-arm64.mk
+++ b/ots.target.linux-arm64.mk
@@ -24,6 +24,8 @@
GYP_COPIED_SOURCE_ORIGIN_DIRS :=
LOCAL_SRC_FILES := \
+ third_party/ots/src/cbdt.cc \
+ third_party/ots/src/cblc.cc \
third_party/ots/src/cff.cc \
third_party/ots/src/cff_type2_charstring.cc \
third_party/ots/src/cmap.cc \
diff --git a/ots.target.linux-mips.mk b/ots.target.linux-mips.mk
index d63f5b9..e28a122 100644
--- a/ots.target.linux-mips.mk
+++ b/ots.target.linux-mips.mk
@@ -24,6 +24,8 @@
GYP_COPIED_SOURCE_ORIGIN_DIRS :=
LOCAL_SRC_FILES := \
+ third_party/ots/src/cbdt.cc \
+ third_party/ots/src/cblc.cc \
third_party/ots/src/cff.cc \
third_party/ots/src/cff_type2_charstring.cc \
third_party/ots/src/cmap.cc \
diff --git a/ots.target.linux-x86.mk b/ots.target.linux-x86.mk
index 991b3eb..f68873f 100644
--- a/ots.target.linux-x86.mk
+++ b/ots.target.linux-x86.mk
@@ -24,6 +24,8 @@
GYP_COPIED_SOURCE_ORIGIN_DIRS :=
LOCAL_SRC_FILES := \
+ third_party/ots/src/cbdt.cc \
+ third_party/ots/src/cblc.cc \
third_party/ots/src/cff.cc \
third_party/ots/src/cff_type2_charstring.cc \
third_party/ots/src/cmap.cc \
diff --git a/ots.target.linux-x86_64.mk b/ots.target.linux-x86_64.mk
index d070b3a..6e6a488 100644
--- a/ots.target.linux-x86_64.mk
+++ b/ots.target.linux-x86_64.mk
@@ -24,6 +24,8 @@
GYP_COPIED_SOURCE_ORIGIN_DIRS :=
LOCAL_SRC_FILES := \
+ third_party/ots/src/cbdt.cc \
+ third_party/ots/src/cblc.cc \
third_party/ots/src/cff.cc \
third_party/ots/src/cff_type2_charstring.cc \
third_party/ots/src/cmap.cc \