Remove dead code
This commit is contained in:
Cheng Zhao
Kevin Sawicki
Родитель
5e7a7fa497
Коммит
b90969294b
|
|
@ -1,87 +0,0 @@
|
|||
{
|
||||
'targets': [
|
||||
{
|
||||
'target_name': 'chromiumcontent_all',
|
||||
'type': 'none',
|
||||
'dependencies': [
|
||||
'chromiumcontent',
|
||||
'<(DEPTH)/chrome/chrome.gyp:chromedriver',
|
||||
],
|
||||
'conditions': [
|
||||
['OS=="linux"', {
|
||||
'dependencies': [
|
||||
'chromiumviews',
|
||||
'<(DEPTH)/build/linux/system.gyp:libspeechd',
|
||||
'<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
|
||||
],
|
||||
}],
|
||||
['OS=="win"', {
|
||||
'dependencies': [
|
||||
'chromiumviews',
|
||||
],
|
||||
}],
|
||||
],
|
||||
},
|
||||
{
|
||||
'target_name': 'chromiumcontent',
|
||||
# Build chromiumcontent as shared_library otherwise some static libraries
|
||||
# will not build.
|
||||
'type': 'shared_library',
|
||||
'dependencies': [
|
||||
'<(DEPTH)/components/prefs/prefs.gyp:prefs',
|
||||
'<(DEPTH)/components/components.gyp:cdm_renderer',
|
||||
'<(DEPTH)/components/components.gyp:cookie_config',
|
||||
'<(DEPTH)/components/components.gyp:devtools_discovery',
|
||||
'<(DEPTH)/components/components.gyp:devtools_http_handler',
|
||||
'<(DEPTH)/components/components.gyp:security_state',
|
||||
'<(DEPTH)/content/content.gyp:content',
|
||||
'<(DEPTH)/content/content.gyp:content_app_both',
|
||||
'<(DEPTH)/content/content_shell_and_tests.gyp:content_shell_pak',
|
||||
'<(DEPTH)/net/net.gyp:net_with_v8',
|
||||
'<(DEPTH)/ppapi/ppapi_internal.gyp:ppapi_host',
|
||||
'<(DEPTH)/ppapi/ppapi_internal.gyp:ppapi_proxy',
|
||||
'<(DEPTH)/ppapi/ppapi_internal.gyp:ppapi_ipc',
|
||||
'<(DEPTH)/ppapi/ppapi_internal.gyp:ppapi_shared',
|
||||
'<(DEPTH)/third_party/webrtc/modules/modules.gyp:desktop_capture',
|
||||
'<(DEPTH)/third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter',
|
||||
'<(DEPTH)/third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
|
||||
'<(DEPTH)/ui/events/events.gyp:dom_keycode_converter',
|
||||
],
|
||||
'sources': [
|
||||
'empty.cc',
|
||||
],
|
||||
'conditions': [
|
||||
['OS=="win"', {
|
||||
'dependencies': [
|
||||
'<(DEPTH)/pdf/pdf.gyp:pdf',
|
||||
],
|
||||
}],
|
||||
],
|
||||
},
|
||||
],
|
||||
'conditions': [
|
||||
['OS in ["win", "linux"]', {
|
||||
'targets': [
|
||||
{
|
||||
'target_name': 'chromiumviews',
|
||||
'type': 'none',
|
||||
'dependencies': [
|
||||
'<(DEPTH)/ui/content_accelerators/ui_content_accelerators.gyp:ui_content_accelerators',
|
||||
'<(DEPTH)/ui/display/display.gyp:display',
|
||||
'<(DEPTH)/ui/display/display.gyp:display_util',
|
||||
'<(DEPTH)/ui/views/controls/webview/webview.gyp:webview',
|
||||
'<(DEPTH)/ui/views/views.gyp:views',
|
||||
'<(DEPTH)/ui/wm/wm.gyp:wm',
|
||||
],
|
||||
'conditions': [
|
||||
['OS=="linux"', {
|
||||
'dependencies': [
|
||||
'<(DEPTH)/chrome/browser/ui/libgtk2ui/libgtk2ui.gyp:gtk2ui',
|
||||
],
|
||||
}], # OS=="linux"
|
||||
],
|
||||
},
|
||||
],
|
||||
}],
|
||||
],
|
||||
}
|
||||
|
|
@ -1,139 +0,0 @@
|
|||
{
|
||||
'variables': {
|
||||
# Don't use nacl.
|
||||
'disable_nacl': 1,
|
||||
# Enable using proprietary codecs.
|
||||
'proprietary_codecs': 1,
|
||||
# Build ffmpeg as shared library.
|
||||
'ffmpeg_component': 'shared_library',
|
||||
# Enable support for Widevine CDM.
|
||||
'enable_widevine': 1,
|
||||
# Using libc++ requires building for >= 10.7.
|
||||
'mac_deployment_target': '10.8',
|
||||
# Use the standard way of linking with msvc runtime.
|
||||
'win_use_allocator_shim': 0,
|
||||
# The V8 libraries.
|
||||
'v8_libraries': '["v8", "v8_snapshot", "v8_nosnapshot", "v8_external_snapshot", "v8_base", "v8_libbase", "v8_libplatform"]',
|
||||
# The icu libraries.
|
||||
'icu_libraries': '["icui18n", "icuuc"]',
|
||||
'conditions': [
|
||||
['OS=="win"', {
|
||||
# On Chrome 41 this is disabled on Windows.
|
||||
'v8_use_external_startup_data': 1,
|
||||
}],
|
||||
['OS=="linux"', {
|
||||
# Enable high DPI support on Linux.
|
||||
'enable_hidpi': 1,
|
||||
# Use Dbus.
|
||||
'use_dbus': 1,
|
||||
# Make Linux build contain debug symbols, this flag will add '-g' to
|
||||
# cflags.
|
||||
'linux_dump_symbols': 1,
|
||||
# Force using gold linker.
|
||||
'linux_use_bundled_gold': 1,
|
||||
'conditions': [
|
||||
['target_arch=="arm"', {
|
||||
'arm_version': 7,
|
||||
'arm_float_abi': 'hard',
|
||||
}],
|
||||
['target_arch=="ia32"', {
|
||||
# The |character_data_generator| target depends on |icuuc#host|, and
|
||||
# for ia32 targets the latter always builds ia32 binaries for x64
|
||||
# host.
|
||||
# We should be able to remove this after switching to GN build.
|
||||
'generate_character_data': 0,
|
||||
}],
|
||||
],
|
||||
}],
|
||||
],
|
||||
},
|
||||
'target_defaults': {
|
||||
'msvs_disabled_warnings': [
|
||||
# class 'std::xx' needs to have dll-interface. Chrome turns this off
|
||||
# for component builds, and we need to too.
|
||||
4251,
|
||||
# The file contains a character that cannot be represented in these
|
||||
# current code page
|
||||
4819,
|
||||
# no matching operator delete found; memory will not be freed if
|
||||
# initialization throws an exception
|
||||
4291,
|
||||
# non dll-interface class used as base for dll-interface class
|
||||
4275,
|
||||
# 'GetVersionExW': was declared deprecated
|
||||
4996,
|
||||
# result of 32-bit shift implicitly converted to 64 bits
|
||||
4334,
|
||||
],
|
||||
'xcode_settings': {
|
||||
'WARNING_CFLAGS': [
|
||||
'-Wno-deprecated-declarations',
|
||||
],
|
||||
# Use C++11 library.
|
||||
'CLANG_CXX_LIBRARY': 'libc++', # -stdlib=libc++
|
||||
},
|
||||
# Force exporting icu's symbols.
|
||||
'defines': [
|
||||
'U_COMBINED_IMPLEMENTATION',
|
||||
# Defining "U_COMBINED_IMPLEMENTATION" will add "explicit" for some
|
||||
# constructors, make sure it doesn' happen.
|
||||
'UNISTR_FROM_CHAR_EXPLICIT=',
|
||||
'UNISTR_FROM_STRING_EXPLICIT=',
|
||||
'U_NO_DEFAULT_INCLUDE_UTF_HEADERS=0',
|
||||
],
|
||||
'defines!': [
|
||||
'U_STATIC_IMPLEMENTATION',
|
||||
],
|
||||
'conditions': [
|
||||
['OS=="linux" and target_arch=="arm"', {
|
||||
# Work around ODR violations.
|
||||
'ldflags!': [
|
||||
'-Wl,--detect-odr-violations',
|
||||
],
|
||||
}],
|
||||
['mac_mas_build==1', {
|
||||
'defines': [
|
||||
'MAS_BUILD',
|
||||
],
|
||||
}],
|
||||
],
|
||||
'target_conditions': [
|
||||
['_type=="static_library" and _toolset=="target" and OS=="linux"', {
|
||||
'standalone_static_library': 1,
|
||||
}],
|
||||
['_target_name in <(v8_libraries) + <(icu_libraries)', {
|
||||
'xcode_settings': {
|
||||
'DEAD_CODE_STRIPPING': 'NO', # -Wl,-dead_strip
|
||||
'GCC_INLINES_ARE_PRIVATE_EXTERN': 'NO',
|
||||
'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO',
|
||||
},
|
||||
'cflags!': [
|
||||
'-fvisibility=hidden',
|
||||
'-fdata-sections',
|
||||
'-ffunction-sections',
|
||||
],
|
||||
'cflags_cc!': ['-fvisibility-inlines-hidden'],
|
||||
}],
|
||||
['_target_name in <(v8_libraries) + ["mksnapshot"]', {
|
||||
'defines': [
|
||||
'V8_SHARED',
|
||||
'BUILDING_V8_SHARED',
|
||||
],
|
||||
}],
|
||||
['_target_name in ["gtk2ui"]', {
|
||||
'type': 'static_library',
|
||||
'standalone_static_library': 1,
|
||||
'cflags': [
|
||||
'-Wno-sentinel',
|
||||
],
|
||||
}],
|
||||
['_target_name=="ui_base"', {
|
||||
'xcode_settings': {
|
||||
'WARNING_CFLAGS': [
|
||||
'-Wno-partial-availability',
|
||||
],
|
||||
},
|
||||
}],
|
||||
],
|
||||
},
|
||||
}
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
// This file exists solely to tell gyp to link libchromiumcontent as a C++
|
||||
// module rather than as a C module.
|
||||
|
|
@ -137,47 +137,6 @@ def tar_xf(filename):
|
|||
os.remove(tar_name)
|
||||
|
||||
|
||||
def gyp_env(target_arch, component, gyp_defines):
|
||||
env = os.environ.copy()
|
||||
|
||||
if component == 'ffmpeg':
|
||||
gyp_defines += ' ffmpeg_branding=Chromium'
|
||||
else:
|
||||
gyp_defines += ' ffmpeg_branding=Chrome component={0}'.format(component)
|
||||
|
||||
env['GYP_GENERATORS'] = 'ninja'
|
||||
|
||||
if sys.platform in ['win32', 'cygwin']:
|
||||
# Do not let Chromium download their own toolchains.
|
||||
env['DEPOT_TOOLS_WIN_TOOLCHAIN'] = '0'
|
||||
# Use VS 2015.
|
||||
env['GYP_MSVS_VERSION'] = '2015'
|
||||
# Use Windows 10 SDK.
|
||||
env['WINDOWSSDKDIR'] = 'C:\\Program Files (x86)\\Windows Kits\\10'
|
||||
elif sys.platform == 'linux2' and target_arch in ('arm', 'ia32'):
|
||||
# ARM build requires cross compilation.
|
||||
env['GYP_CROSSCOMPILE'] = '1'
|
||||
|
||||
# Whether to build for Mac App Store.
|
||||
if env.has_key('MAS_BUILD'):
|
||||
gyp_defines += ' mac_mas_build=1'
|
||||
else:
|
||||
gyp_defines += ' mac_mas_build=0'
|
||||
|
||||
# Always build on 64-bit machine.
|
||||
gyp_defines += ' host_arch=x64'
|
||||
|
||||
# Build 32-bit or 64-bit.
|
||||
gyp_defines += ' target_arch={0}'.format(target_arch)
|
||||
env['GYP_DEFINES'] = gyp_defines
|
||||
|
||||
# Output directory.
|
||||
output_dir = 'output_dir={0}'.format(get_output_dir(target_arch, component))
|
||||
env['GYP_GENERATOR_FLAGS'] = output_dir
|
||||
|
||||
return env
|
||||
|
||||
|
||||
def copy_chromiumcontent_files():
|
||||
try:
|
||||
os.makedirs(CHROMIUMCONTENT_DESTINATION_DIR)
|
||||
|
|
@ -210,16 +169,6 @@ def update_clang():
|
|||
return subprocess.call([sys.executable, update])
|
||||
|
||||
|
||||
def run_gyp(target_arch, defines):
|
||||
os.chdir(SRC_DIR)
|
||||
gyp = os.path.join('build', 'gyp_chromium')
|
||||
relative_dir = os.path.relpath(CHROMIUMCONTENT_DESTINATION_DIR, SRC_DIR)
|
||||
args = [sys.executable, gyp, '-Ichromiumcontent/chromiumcontent.gypi',
|
||||
os.path.join(relative_dir, 'chromiumcontent.gyp')]
|
||||
for component in COMPONENTS:
|
||||
subprocess.call(args, env=gyp_env(target_arch, component, defines))
|
||||
|
||||
|
||||
def update_gn():
|
||||
os.chdir(SRC_DIR)
|
||||
download = os.path.join(DEPOT_TOOLS, 'download_from_google_storage.py')
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче