diff options
author | tommi <tommi@chromium.org> | 2015-08-26 01:45:41 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-26 08:46:16 +0000 |
commit | a1e4c970af90488466a54f29529b2741a433c104 (patch) | |
tree | 1ae0187f4e72a130ce2ee443ed96e423accc9b6f | |
parent | 23c17cafe527c608e8999c792494e5fe99e654f5 (diff) | |
download | chromium_src-a1e4c970af90488466a54f29529b2741a433c104.zip chromium_src-a1e4c970af90488466a54f29529b2741a433c104.tar.gz chromium_src-a1e4c970af90488466a54f29529b2741a433c104.tar.bz2 |
Remove references to an old gyp variable that's no longer supported.
BUG=463660
Review URL: https://codereview.chromium.org/1318583002
Cr-Commit-Position: refs/heads/master@{#345562}
-rw-r--r-- | build/common.gypi | 3 | ||||
-rw-r--r-- | build/isolate.gypi | 1 | ||||
-rw-r--r-- | chrome/browser_tests.isolate | 7 | ||||
-rw-r--r-- | chrome/chrome_dll_bundle.gypi | 9 | ||||
-rw-r--r-- | chrome/chrome_installer.gypi | 6 | ||||
-rw-r--r-- | content/content_shell.gypi | 15 |
6 files changed, 0 insertions, 41 deletions
diff --git a/build/common.gypi b/build/common.gypi index ab6fc6c..b58fede 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -1434,9 +1434,6 @@ # TODO(thakis): Make this a blacklist instead, http://crbug.com/101600 'enable_wexit_time_destructors%': 0, - # Build libpeerconnection as a static library by default. - 'libpeer_target_type%': 'static_library', - # Set to 1 to compile with the OpenGL ES 2.0 conformance tests. 'internal_gles2_conform_tests%': 0, diff --git a/build/isolate.gypi b/build/isolate.gypi index 0fbf28c..fc82a15 100644 --- a/build/isolate.gypi +++ b/build/isolate.gypi @@ -89,7 +89,6 @@ '--config-variable', 'internal_gles2_conform_tests=<(internal_gles2_conform_tests)', '--config-variable', 'kasko=<(kasko)', - '--config-variable', 'libpeer_target_type=<(libpeer_target_type)', '--config-variable', 'lsan=<(lsan)', '--config-variable', 'msan=<(msan)', '--config-variable', 'target_arch=<(target_arch)', diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate index 6de780b..ca17792 100644 --- a/chrome/browser_tests.isolate +++ b/chrome/browser_tests.isolate @@ -50,13 +50,6 @@ ], }, }], - ['OS=="linux" and libpeer_target_type=="loadable_module"', { - 'variables': { - 'files': [ - '<(PRODUCT_DIR)/lib/libpeerconnection.so', - ], - }, - }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'files': [ diff --git a/chrome/chrome_dll_bundle.gypi b/chrome/chrome_dll_bundle.gypi index e9fc103..b494b89 100644 --- a/chrome/chrome_dll_bundle.gypi +++ b/chrome/chrome_dll_bundle.gypi @@ -101,7 +101,6 @@ }, ], 'variables': { - 'libpeer_target_type%': 'static_library', 'theme_dir_name': '<(branding_path_component)', }, 'postbuilds': [ @@ -271,14 +270,6 @@ '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_200_percent.pak', ], }], - ['enable_webrtc==1 and libpeer_target_type!="static_library"', { - 'copies': [{ - 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries', - 'files': [ - '<(PRODUCT_DIR)/libpeerconnection.so', - ], - }], - }], ['icu_use_data_file_flag==1', { 'mac_bundle_resources': [ '<(PRODUCT_DIR)/icudtl.dat', diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi index ba3ccbf..9c9a8dc 100644 --- a/chrome/chrome_installer.gypi +++ b/chrome/chrome_installer.gypi @@ -5,7 +5,6 @@ { 'variables': { 'lastchange_path': '../build/util/LASTCHANGE', - 'libpeer_target_type%': 'static_library', 'branding_dir': 'app/theme/<(branding_path_component)', 'branding_dir_100': 'app/theme/default_100_percent/<(branding_path_component)', }, @@ -493,11 +492,6 @@ 'deb_arch': 'arm', 'rpm_arch': 'arm', }], - ['libpeer_target_type!="static_library"', { - 'packaging_files_binaries': [ - '<(PRODUCT_DIR)/lib/libpeerconnection.so', - ], - }], ['asan==1', { 'packaging_files_binaries': [ '<(PRODUCT_DIR)/lib/libc++.so', diff --git a/content/content_shell.gypi b/content/content_shell.gypi index 21a6213..5ff3a2d 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -786,21 +786,6 @@ }, ], 'conditions': [ - ['enable_webrtc==1', { - 'variables': { - 'libpeer_target_type%': 'static_library', - }, - 'conditions': [ - ['libpeer_target_type!="static_library"', { - 'copies': [{ - 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries', - 'files': [ - '<(PRODUCT_DIR)/libpeerconnection.so', - ], - }], - }], - ], - }], ['icu_use_data_file_flag==1', { 'mac_bundle_resources': [ '<(PRODUCT_DIR)/icudtl.dat', |