Update makefiles after merge of Chromium at 280795
This commit was generated by merge_from_chromium.py.
Change-Id: I745a11796f52b04490f1f6aab7dcf7e9509b5235
diff --git a/ots.target.darwin-arm.mk b/ots.target.darwin-arm.mk
index 5d84ff9..c37bae3 100644
--- a/ots.target.darwin-arm.mk
+++ b/ots.target.darwin-arm.mk
@@ -24,8 +24,6 @@
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 87c14b5..7176bd6 100644
--- a/ots.target.darwin-arm64.mk
+++ b/ots.target.darwin-arm64.mk
@@ -24,8 +24,6 @@
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 f68873f..991b3eb 100644
--- a/ots.target.darwin-x86.mk
+++ b/ots.target.darwin-x86.mk
@@ -24,8 +24,6 @@
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 5d84ff9..c37bae3 100644
--- a/ots.target.linux-arm.mk
+++ b/ots.target.linux-arm.mk
@@ -24,8 +24,6 @@
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 87c14b5..7176bd6 100644
--- a/ots.target.linux-arm64.mk
+++ b/ots.target.linux-arm64.mk
@@ -24,8 +24,6 @@
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 e28a122..d63f5b9 100644
--- a/ots.target.linux-mips.mk
+++ b/ots.target.linux-mips.mk
@@ -24,8 +24,6 @@
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 f68873f..991b3eb 100644
--- a/ots.target.linux-x86.mk
+++ b/ots.target.linux-x86.mk
@@ -24,8 +24,6 @@
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 6e6a488..d070b3a 100644
--- a/ots.target.linux-x86_64.mk
+++ b/ots.target.linux-x86_64.mk
@@ -24,8 +24,6 @@
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 \
