Remove all .gyp and .gypi files. Except: * //build/linux/system.gyp * //third_party/boringssl/boringssl.gypi * //skia/skia_gn_files.gypi (which are all currently consumed via //build/gypi_to_gn.py). Also remove the remaining contents of //build/linux/unbundle. R=jamesr@chromium.org Review URL: https://codereview.chromium.org/1438853002 .
diff --git a/url.gyp b/url.gyp deleted file mode 100644 index 4114801..0000000 --- a/url.gyp +++ /dev/null
@@ -1,127 +0,0 @@ -# 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. - -{ - 'variables': { - 'chromium_code': 1, - }, - 'includes': [ - 'url_srcs.gypi', - ], - 'targets': [ - { - # Note, this target_name cannot be 'url', because that will generate - # 'url.dll' for a Windows component build, and that will confuse Windows, - # which has a system DLL with the same name. - 'target_name': 'url_lib', - 'type': '<(component)', - 'dependencies': [ - '../base/base.gyp:base', - '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', - '../third_party/icu/icu.gyp:icui18n', - '../third_party/icu/icu.gyp:icuuc', - ], - 'sources': [ - '<@(gurl_sources)', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '..', - ], - }, - 'defines': [ - 'URL_IMPLEMENTATION', - ], - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [4267, ], - }, - { - 'target_name': 'url_unittests', - 'type': 'executable', - 'dependencies': [ - '../base/base.gyp:run_all_unittests', - '../testing/gtest.gyp:gtest', - '../third_party/icu/icu.gyp:icuuc', - 'url_lib', - ], - 'sources': [ - 'gurl_unittest.cc', - 'origin_unittest.cc', - 'url_canon_icu_unittest.cc', - 'url_canon_unittest.cc', - 'url_parse_unittest.cc', - 'url_test_utils.h', - 'url_util_unittest.cc', - ], - 'conditions': [ - ['os_posix==1 and OS!="mac" and OS!="ios" and use_allocator!="none"', - { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - } - ], - ], - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [4267, ], - }, - ], - 'conditions': [ - ['OS=="android"', { - 'targets': [ - { - 'target_name': 'url_jni_headers', - 'type': 'none', - 'sources': [ - 'android/java/src/org/chromium/url/IDNStringUtil.java' - ], - 'variables': { - 'jni_gen_package': 'url', - }, - 'includes': [ '../build/jni_generator.gypi' ], - }, - { - 'target_name': 'url_java', - 'type': 'none', - 'variables': { - 'java_in_dir': '../url/android/java', - }, - 'dependencies': [ - '../base/base.gyp:base', - ], - 'includes': [ '../build/java.gypi' ], - }, - { - # Same as url_lib but using ICU alternatives on Android. - 'target_name': 'url_lib_use_icu_alternatives_on_android', - 'type': '<(component)', - 'dependencies': [ - '../base/base.gyp:base', - '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', - 'url_java', - 'url_jni_headers', - ], - 'sources': [ - '<@(gurl_sources)', - 'url_canon_icu_alternatives_android.cc', - 'url_canon_icu_alternatives_android.h', - ], - 'sources!': [ - 'url_canon_icu.cc', - 'url_canon_icu.h', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '..', - ], - }, - 'defines': [ - 'URL_IMPLEMENTATION', - 'USE_ICU_ALTERNATIVES_ON_ANDROID=1', - ], - }, - ], - }], - ], -}
diff --git a/url_nacl.gyp b/url_nacl.gyp deleted file mode 100644 index 4af75b1..0000000 --- a/url_nacl.gyp +++ /dev/null
@@ -1,37 +0,0 @@ -# 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. - -{ - 'variables': { - 'chromium_code': 1, - }, - 'includes': [ - '../build/common_untrusted.gypi', - 'url_srcs.gypi', - ], - 'targets': [ - { - 'target_name': 'url_nacl', - 'type': 'none', - 'variables': { - 'nlib_target': 'liburl_nacl.a', - 'build_glibc': 0, - 'build_newlib': 0, - 'build_pnacl_newlib': 1, - }, - 'dependencies': [ - '../third_party/icu/icu_nacl.gyp:icudata_nacl', - '../third_party/icu/icu_nacl.gyp:icui18n_nacl', - '../third_party/icu/icu_nacl.gyp:icuuc_nacl', - ], - 'export_dependent_settings': [ - '../third_party/icu/icu_nacl.gyp:icui18n_nacl', - '../third_party/icu/icu_nacl.gyp:icuuc_nacl', - ], - 'sources': [ - '<@(gurl_sources)', - ], - }, # end of target 'url_nacl' - ], -}
diff --git a/url_srcs.gypi b/url_srcs.gypi deleted file mode 100644 index 61db15d..0000000 --- a/url_srcs.gypi +++ /dev/null
@@ -1,44 +0,0 @@ -# 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. - -{ - 'variables': { - 'gurl_sources': [ - 'android/url_jni_registrar.cc', - 'android/url_jni_registrar.h', - 'gurl.cc', - 'gurl.h', - 'origin.cc', - 'origin.h', - 'third_party/mozilla/url_parse.cc', - 'third_party/mozilla/url_parse.h', - 'url_canon.h', - 'url_canon_etc.cc', - 'url_canon_filesystemurl.cc', - 'url_canon_fileurl.cc', - 'url_canon_host.cc', - 'url_canon_icu.cc', - 'url_canon_icu.h', - 'url_canon_internal.cc', - 'url_canon_internal.h', - 'url_canon_internal_file.h', - 'url_canon_ip.cc', - 'url_canon_ip.h', - 'url_canon_mailtourl.cc', - 'url_canon_path.cc', - 'url_canon_pathurl.cc', - 'url_canon_query.cc', - 'url_canon_relative.cc', - 'url_canon_stdstring.cc', - 'url_canon_stdurl.cc', - 'url_constants.cc', - 'url_constants.h', - 'url_file.h', - 'url_parse_file.cc', - 'url_parse_internal.h', - 'url_util.cc', - 'url_util.h', - ], - }, -}