From ba5b9a6411cb1792fd21f0a078d7a25cd1ceec16 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Mon, 12 Aug 2013 14:20:17 +0100 Subject: Merge from Chromium at DEPS revision r216972 This commit was generated by merge_to_master.py. Change-Id: I01cb28d94e3fcf99e3624d75cafa50d929787ddd --- url/url_lib.target.linux-arm.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'url/url_lib.target.linux-arm.mk') diff --git a/url/url_lib.target.linux-arm.mk b/url/url_lib.target.linux-arm.mk index 0f359f55fc..30e0c4bca8 100644 --- a/url/url_lib.target.linux-arm.mk +++ b/url/url_lib.target.linux-arm.mk @@ -27,6 +27,7 @@ GYP_COPIED_SOURCE_ORIGIN_DIRS := LOCAL_SRC_FILES := \ url/gurl.cc \ + url/third_party/mozilla/url_parse.cc \ url/url_canon_etc.cc \ url/url_canon_filesystemurl.cc \ url/url_canon_fileurl.cc \ @@ -40,7 +41,6 @@ LOCAL_SRC_FILES := \ url/url_canon_query.cc \ url/url_canon_relative.cc \ url/url_canon_stdurl.cc \ - url/url_parse.cc \ url/url_parse_file.cc \ url/url_util.cc -- cgit v1.2.3