Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(893)

Unified Diff: third_party/libaddressinput/chromium/cpp/gtest.gyp

Issue 389863002: Remove Chrome's own version of libaddressinput in favor of the upstream. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/libaddressinput/chromium/cpp/gtest.gyp
diff --git a/third_party/libaddressinput/chromium/cpp/gtest.gyp b/third_party/libaddressinput/chromium/cpp/gtest.gyp
deleted file mode 100644
index 19977b2354fe4bd7034c92d18d6ff37ce9b26e3f..0000000000000000000000000000000000000000
--- a/third_party/libaddressinput/chromium/cpp/gtest.gyp
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright (C) 2013 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-{
- 'variables': {
- # Default include directories. Override with your system's include paths or
- # paths to your own implementations.
- 'gtest_dir%': '/usr/include',
- 'gtest_src_dir%': '/usr/src/gtest',
- },
- 'targets': [
- {
- 'target_name': 'main',
- 'type': 'static_library',
- 'sources': [
- '<(SHARED_INTERMEDIATE_DIR)/src/gtest-all.cc',
- ],
- 'include_dirs': [
- '<(gtest_dir)',
- '<(gtest_src_dir)',
- ],
- 'copies': [
- {
- 'destination': '<(SHARED_INTERMEDIATE_DIR)/src',
- 'files': [
- '<(gtest_src_dir)/src/gtest-all.cc',
- '<(gtest_src_dir)/src/gtest_main.cc',
- ],
- },
- ],
- 'direct_dependent_settings': {
- 'sources': [
- '<(SHARED_INTERMEDIATE_DIR)/src/gtest_main.cc',
- ],
- 'include_dirs': [
- '<(gtest_dir)',
- ],
- 'conditions': [
- ['OS == "linux"', {
- 'ldflags': [
- '-pthread', # GTest needs to link to pthread on Linux.
- ],
- }],
- ],
- },
- },
- ],
-}

Powered by Google App Engine
This is Rietveld 408576698