From d189bab71b15453f0007ad2818e68cf4a2a513ce Mon Sep 17 00:00:00 2001 From: klzgrad Date: Thu, 25 Jan 2018 05:02:13 -0500 Subject: [PATCH] build: Remove icu --- src/net/BUILD.gn | 6 ++- src/net/base/filename_util_icu_dummy.cc | 45 +++++++++++++++++++ .../net_string_util_icu_alternatives_dummy.cc | 44 ++++++++++++++++++ src/url/BUILD.gn | 3 +- src/url/url_canon_icu_alternatives_dummy.cc | 15 +++++++ 5 files changed, 109 insertions(+), 4 deletions(-) create mode 100644 src/net/base/filename_util_icu_dummy.cc create mode 100644 src/net/base/net_string_util_icu_alternatives_dummy.cc create mode 100644 src/url/url_canon_icu_alternatives_dummy.cc diff --git a/src/net/BUILD.gn b/src/net/BUILD.gn index b3d97f6a0a..fc6559ab94 100644 --- a/src/net/BUILD.gn +++ b/src/net/BUILD.gn @@ -2215,8 +2215,10 @@ component("net") { # Use ICU alternative on iOS. sources += [ "base/net_string_util_icu_alternatives_ios.mm" ] } else { - assert(false, - "ICU alternative is not implemented for platform: " + target_os) + sources += [ + "base/filename_util_icu_dummy.cc", + "base/net_string_util_icu_alternatives_dummy.cc", + ] } } else { # Use ICU. diff --git a/src/net/base/filename_util_icu_dummy.cc b/src/net/base/filename_util_icu_dummy.cc new file mode 100644 index 0000000000..d67c8c9df3 --- /dev/null +++ b/src/net/base/filename_util_icu_dummy.cc @@ -0,0 +1,45 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "net/base/filename_util.h" + +#include "base/files/file_path.h" +#include "base/logging.h" +#include "base/strings/string16.h" + +class GURL; + +namespace net { + +bool IsSafePortablePathComponent(const base::FilePath& component) { + NOTIMPLEMENTED(); + return false; +} + +bool IsSafePortableRelativePath(const base::FilePath& path) { + NOTIMPLEMENTED(); + return false; +} + +base::string16 GetSuggestedFilename(const GURL& url, + const std::string& content_disposition, + const std::string& referrer_charset, + const std::string& suggested_name, + const std::string& mime_type, + const std::string& default_name) { + NOTIMPLEMENTED(); + return base::string16(); +} + +base::FilePath GenerateFileName(const GURL& url, + const std::string& content_disposition, + const std::string& referrer_charset, + const std::string& suggested_name, + const std::string& mime_type, + const std::string& default_file_name) { + NOTIMPLEMENTED(); + return base::FilePath(); +} + +} // namespace net diff --git a/src/net/base/net_string_util_icu_alternatives_dummy.cc b/src/net/base/net_string_util_icu_alternatives_dummy.cc new file mode 100644 index 0000000000..cdfc973b89 --- /dev/null +++ b/src/net/base/net_string_util_icu_alternatives_dummy.cc @@ -0,0 +1,44 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "net/base/net_string_util.h" + +#include "base/logging.h" +#include "base/strings/string_piece.h" + +namespace net { + +const char* const kCharsetLatin1 = ""; + +bool ConvertToUtf8(base::StringPiece text, const char* charset, + std::string* output) { + NOTIMPLEMENTED(); + return false; +} + +bool ConvertToUtf8AndNormalize(base::StringPiece text, const char* charset, + std::string* output) { + NOTIMPLEMENTED(); + return false; +} + +bool ConvertToUTF16(base::StringPiece text, const char* charset, + base::string16* output) { + NOTIMPLEMENTED(); + return false; +} + +bool ConvertToUTF16WithSubstitutions(base::StringPiece text, + const char* charset, + base::string16* output) { + NOTIMPLEMENTED(); + return false; +} + +bool ToUpper(base::StringPiece16 str, base::string16* output) { + NOTIMPLEMENTED(); + return false; +} + +} // namespace net diff --git a/src/url/BUILD.gn b/src/url/BUILD.gn index b52a228621..8f4249d57f 100644 --- a/src/url/BUILD.gn +++ b/src/url/BUILD.gn @@ -82,8 +82,7 @@ component("url") { } else if (is_ios) { sources += [ "url_idna_icu_alternatives_ios.mm" ] } else { - assert(false, - "ICU alternative is not implemented for platform: " + target_os) + sources += [ "url_canon_icu_alternatives_dummy.cc" ] } } else { # Use ICU. diff --git a/src/url/url_canon_icu_alternatives_dummy.cc b/src/url/url_canon_icu_alternatives_dummy.cc new file mode 100644 index 0000000000..ab439ee19a --- /dev/null +++ b/src/url/url_canon_icu_alternatives_dummy.cc @@ -0,0 +1,15 @@ +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "base/logging.h" +#include "url/url_canon.h" + +namespace url { + +bool IDNToASCII(const base::char16* src, int src_len, CanonOutputW* output) { + NOTIMPLEMENTED(); + return false; +} + +} // namespace url