Skip to content

GitLab

T
tangled
Commit 7c699557 authored by brettw's avatar brettw Committed by Commit bot
Browse files
Options

Remove gypi integration from libaddressinput and openh264 

This inlines the .gypi variables and deletes the obsolete files.

TBR=dpranke

Review-Url: https://codereview.chromium.org/2308173002
Cr-Commit-Position: refs/heads/master@{#416418}
parent 9c63d444
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 264 additions and 574 deletions
third_party/libaddressinput/BUILD.gn
View file @ 7c699557
...@@ -6,32 +6,12 @@ import("//testing/test.gni") ...@@ -6,32 +6,12 @@ import("//testing/test.gni")
import("//build/config/locales.gni") import("//build/config/locales.gni")
import("//tools/grit/grit_rule.gni") import("//tools/grit/grit_rule.gni")
libaddressinput_util_files = [
"src/cpp/src/address_data.cc",
"src/cpp/src/address_field.cc",
"src/cpp/src/address_field_util.cc",
"src/cpp/src/address_formatter.cc",
"src/cpp/src/address_metadata.cc",
"src/cpp/src/address_ui.cc",
"src/cpp/src/format_element.cc",
"src/cpp/src/language.cc",
"src/cpp/src/localization.cc",
"src/cpp/src/lookup_key.cc",
"src/cpp/src/region_data_constants.cc",
"src/cpp/src/rule.cc",
"src/cpp/src/util/cctype_tolower_equal.cc",
"src/cpp/src/util/json.cc",
"src/cpp/src/util/string_split.cc",
"src/cpp/src/util/string_util.cc",
]
config("no-newline-eof-warning") { config("no-newline-eof-warning") {
if (is_clang) { if (is_clang) {
cflags = [ "-Wno-newline-eof" ] cflags = [ "-Wno-newline-eof" ]
} }
} }
# GYP version: third_party/libaddressinput/libaddressinput.gyp:libaddressinput_strings
grit("strings") { grit("strings") {
source = "//chrome/app/address_input_strings.grd" source = "//chrome/app/address_input_strings.grd"
outputs = [ outputs = [
...@@ -57,14 +37,26 @@ config("libaddressinput_config") { ...@@ -57,14 +37,26 @@ config("libaddressinput_config") {
} }
# This target provides basic functionality which is cooked into the build. # This target provides basic functionality which is cooked into the build.
# GYP version: third_party/libaddressinput/libaddressinput.gyp:libaddressinput_util
static_library("util") { static_library("util") {
sources = libaddressinput_util_files sources = [
sources += [
"chromium/addressinput_util.cc", "chromium/addressinput_util.cc",
"chromium/json.cc", "chromium/json.cc",
"src/cpp/src/address_data.cc",
"src/cpp/src/address_field.cc",
"src/cpp/src/address_field_util.cc",
"src/cpp/src/address_formatter.cc",
"src/cpp/src/address_metadata.cc",
"src/cpp/src/address_ui.cc",
"src/cpp/src/format_element.cc",
"src/cpp/src/language.cc",
"src/cpp/src/localization.cc",
"src/cpp/src/lookup_key.cc",
"src/cpp/src/region_data_constants.cc",
"src/cpp/src/rule.cc",
"src/cpp/src/util/cctype_tolower_equal.cc",
"src/cpp/src/util/string_split.cc",
"src/cpp/src/util/string_util.cc",
] ]
sources -= [ "src/cpp/src/util/json.cc" ]
configs -= [ "//build/config/compiler:chromium_code" ] configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ configs += [
...@@ -86,18 +78,10 @@ static_library("util") { ...@@ -86,18 +78,10 @@ static_library("util") {
} }
if (!is_android || use_aura) { if (!is_android || use_aura) {
# The list of files in libaddressinput.gypi.
gypi_values = exec_script("//build/gypi_to_gn.py",
[ rebase_path("src/cpp/libaddressinput.gypi") ],
"scope",
[ "src/cpp/libaddressinput.gypi" ])
# This target provides more complicated functionality like pinging servers # This target provides more complicated functionality like pinging servers
# for validation rules. # for validation rules.
# GYP version: third_party/libaddressinput/libaddressinput.gyp:libaddressinput
static_library("libaddressinput") { static_library("libaddressinput") {
sources = rebase_path(gypi_values.libaddressinput_files, ".", "src/cpp") sources = [
sources += [
"chromium/chrome_address_validator.cc", "chromium/chrome_address_validator.cc",
"chromium/chrome_metadata_source.cc", "chromium/chrome_metadata_source.cc",
"chromium/chrome_storage_impl.cc", "chromium/chrome_storage_impl.cc",
...@@ -105,9 +89,24 @@ if (!is_android || use_aura) { ...@@ -105,9 +89,24 @@ if (!is_android || use_aura) {
"chromium/input_suggester.cc", "chromium/input_suggester.cc",
"chromium/string_compare.cc", "chromium/string_compare.cc",
"chromium/trie.cc", "chromium/trie.cc",
"src/cpp/src/address_input_helper.cc",
"src/cpp/src/address_normalizer.cc",
"src/cpp/src/address_problem.cc",
"src/cpp/src/address_validator.cc",
"src/cpp/src/null_storage.cc",
"src/cpp/src/ondemand_supplier.cc",
"src/cpp/src/ondemand_supply_task.cc",
"src/cpp/src/post_box_matchers.cc",
"src/cpp/src/preload_supplier.cc",
"src/cpp/src/region_data.cc",
"src/cpp/src/region_data_builder.cc",
"src/cpp/src/retriever.cc",
"src/cpp/src/rule_retriever.cc",
"src/cpp/src/util/md5.cc",
"src/cpp/src/validating_storage.cc",
"src/cpp/src/validating_util.cc",
"src/cpp/src/validation_task.cc",
] ]
sources -= libaddressinput_util_files
sources -= [ "src/cpp/src/util/string_compare.cc" ]
configs -= [ "//build/config/compiler:chromium_code" ] configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ]
...@@ -127,9 +126,7 @@ if (!is_android || use_aura) { ...@@ -127,9 +126,7 @@ if (!is_android || use_aura) {
} }
test("libaddressinput_unittests") { test("libaddressinput_unittests") {
sources = sources = [
rebase_path(gypi_values.libaddressinput_test_files, ".", "src/cpp")
sources += [
"chromium/addressinput_util_unittest.cc", "chromium/addressinput_util_unittest.cc",
"chromium/chrome_address_validator_unittest.cc", "chromium/chrome_address_validator_unittest.cc",
"chromium/chrome_metadata_source_unittest.cc", "chromium/chrome_metadata_source_unittest.cc",
...@@ -138,6 +135,45 @@ if (!is_android || use_aura) { ...@@ -138,6 +135,45 @@ if (!is_android || use_aura) {
"chromium/storage_test_runner.cc", "chromium/storage_test_runner.cc",
"chromium/string_compare_unittest.cc", "chromium/string_compare_unittest.cc",
"chromium/trie_unittest.cc", "chromium/trie_unittest.cc",
"src/cpp/test/address_data_test.cc",
"src/cpp/test/address_field_test.cc",
"src/cpp/test/address_field_util_test.cc",
"src/cpp/test/address_formatter_test.cc",
"src/cpp/test/address_input_helper_test.cc",
"src/cpp/test/address_metadata_test.cc",
"src/cpp/test/address_normalizer_test.cc",
"src/cpp/test/address_problem_test.cc",
"src/cpp/test/address_ui_test.cc",
"src/cpp/test/address_validator_test.cc",
"src/cpp/test/fake_storage.cc",
"src/cpp/test/fake_storage_test.cc",
"src/cpp/test/format_element_test.cc",
"src/cpp/test/language_test.cc",
"src/cpp/test/localization_test.cc",
"src/cpp/test/lookup_key_test.cc",
"src/cpp/test/mock_source.cc",
"src/cpp/test/null_storage_test.cc",
"src/cpp/test/ondemand_supply_task_test.cc",
"src/cpp/test/post_box_matchers_test.cc",
"src/cpp/test/preload_supplier_test.cc",
"src/cpp/test/region_data_builder_test.cc",
"src/cpp/test/region_data_constants_test.cc",
"src/cpp/test/region_data_test.cc",
"src/cpp/test/retriever_test.cc",
"src/cpp/test/rule_retriever_test.cc",
"src/cpp/test/rule_test.cc",
"src/cpp/test/supplier_test.cc",
"src/cpp/test/testdata_source.cc",
"src/cpp/test/testdata_source_test.cc",
"src/cpp/test/util/json_test.cc",
"src/cpp/test/util/md5_unittest.cc",
"src/cpp/test/util/scoped_ptr_unittest.cc",
"src/cpp/test/util/string_compare_test.cc",
"src/cpp/test/util/string_split_unittest.cc",
"src/cpp/test/util/string_util_test.cc",
"src/cpp/test/validating_storage_test.cc",
"src/cpp/test/validating_util_test.cc",
"src/cpp/test/validation_task_test.cc",
] ]
if (is_ios) { if (is_ios) {
......
third_party/libaddressinput/libaddressinput.gyp deleted 100644 → 0
View file @ 9c63d444
# 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.
{
'includes': ['src/cpp/libaddressinput.gypi'],
'variables': {
'libaddressinput_test_data_dir%': 'src/third_party/libaddressinput/src/testdata',
'libaddressinput_util_files': [
'src/cpp/src/address_data.cc',
'src/cpp/src/address_field.cc',
'src/cpp/src/address_field_util.cc',
'src/cpp/src/address_formatter.cc',
'src/cpp/src/address_metadata.cc',
'src/cpp/src/address_ui.cc',
'src/cpp/src/format_element.cc',
'src/cpp/src/language.cc',
'src/cpp/src/localization.cc',
'src/cpp/src/lookup_key.cc',
'src/cpp/src/region_data_constants.cc',
'src/cpp/src/rule.cc',
'src/cpp/src/util/cctype_tolower_equal.cc',
'src/cpp/src/util/json.cc',
'src/cpp/src/util/string_split.cc',
'src/cpp/src/util/string_util.cc',
],
},
'targets': [
{
'target_name': 'libaddressinput_strings',
'type': 'none',
'variables': {
'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/libaddressinput/',
'grit_grd_file': '../../chrome/app/address_input_strings.grd',
},
'actions': [
{
'action_name': 'libaddressinput_strings',
'variables': {
},
'includes': [
'../../build/grit_action.gypi',
],
},
],
'direct_dependent_settings': {
# Files in libaddressinput include the grit-generated en_messages.cc
# without knowing its path.
'include_dirs': [
'<(grit_out_dir)',
],
},
},
{
'target_name': 'libaddressinput_util',
'type': 'static_library',
'sources': [
'<@(libaddressinput_util_files)',
'chromium/addressinput_util.cc',
'chromium/json.cc',
],
'sources!': [
'src/cpp/src/util/json.cc',
],
'include_dirs': [
'chromium/override/',
'src/cpp/include/',
],
'defines': [
'I18N_ADDRESSINPUT_USE_BASICTYPES_OVERRIDE=1',
],
'direct_dependent_settings': {
'include_dirs': [
'chromium/override/',
'src/cpp/include/',
],
'defines': [
'I18N_ADDRESSINPUT_USE_BASICTYPES_OVERRIDE=1',
],
},
'dependencies': [
'../../base/base.gyp:base',
'../re2/re2.gyp:re2',
'libaddressinput_strings',
],
'export_dependent_settings': [
'libaddressinput_strings',
],
},
{
'target_name': 'libaddressinput',
'type': 'static_library',
'sources': [
'<@(libaddressinput_files)',
'chromium/chrome_address_validator.cc',
'chromium/chrome_metadata_source.cc',
'chromium/chrome_storage_impl.cc',
'chromium/fallback_data_store.cc',
'chromium/input_suggester.cc',
'chromium/string_compare.cc',
'chromium/trie.cc',
],
'sources!': [
'<@(libaddressinput_util_files)',
'src/cpp/src/util/string_compare.cc',
],
'direct_dependent_settings': {
'defines': [
'I18N_ADDRESS_VALIDATION_DATA_URL="https://chromium-i18n.appspot.com/ssl-aggregate-address/"',
],
},
'dependencies': [
'../../base/base.gyp:base',
'../../components/prefs/prefs.gyp:prefs',
'../../net/net.gyp:net',
'../icu/icu.gyp:icui18n',
'../icu/icu.gyp:icuuc',
'../re2/re2.gyp:re2',
'libaddressinput_util',
],
'export_dependent_settings': [
'libaddressinput_util',
],
},
{
'target_name': 'libaddressinput_unittests',
'type': '<(gtest_target_type)',
'sources': [
'<@(libaddressinput_test_files)',
'chromium/addressinput_util_unittest.cc',
'chromium/chrome_address_validator_unittest.cc',
'chromium/chrome_metadata_source_unittest.cc',
'chromium/chrome_storage_impl_unittest.cc',
'chromium/fallback_data_store_unittest.cc',
'chromium/storage_test_runner.cc',
'chromium/string_compare_unittest.cc',
'chromium/trie_unittest.cc',
],
'defines': [
'TEST_DATA_DIR="<(libaddressinput_test_data_dir)"',
],
'include_dirs': [
'../../',
'src/cpp/src/',
],
'dependencies': [
'../../base/base.gyp:run_all_unittests',
'../../components/prefs/prefs.gyp:prefs',
'../../net/net.gyp:net_test_support',
'../../testing/gtest.gyp:gtest',
'libaddressinput',
'libaddressinput_util',
],
},
],
}
third_party/openh264/BUILD.gn
View file @ 7c699557
...@@ -4,11 +4,6 @@ ...@@ -4,11 +4,6 @@
import("//third_party/openh264/openh264_args.gni") import("//third_party/openh264/openh264_args.gni")
# Import source and include variables from openh264.gypi.
openh264_gypi_values = exec_script("//build/gypi_to_gn.py",
[ rebase_path("openh264.gypi") ],
"scope")
# Config shared by all openh264 targets. # Config shared by all openh264 targets.
config("config") { config("config") {
cflags = [] cflags = []
...@@ -33,8 +28,49 @@ config("config") { ...@@ -33,8 +28,49 @@ config("config") {
} }
source_set("common") { source_set("common") {
sources = openh264_gypi_values.openh264_common_sources sources = [
include_dirs = openh264_gypi_values.openh264_common_includes "src/codec/common/inc/WelsThreadLib.h",
"src/codec/common/inc/copy_mb.h",
"src/codec/common/inc/cpu.h",
"src/codec/common/inc/cpu_core.h",
"src/codec/common/inc/crt_util_safe_x.h",
"src/codec/common/inc/deblocking_common.h",
"src/codec/common/inc/expand_pic.h",
"src/codec/common/inc/golomb_common.h",
"src/codec/common/inc/intra_pred_common.h",
"src/codec/common/inc/ls_defines.h",
"src/codec/common/inc/macros.h",
"src/codec/common/inc/mc.h",
"src/codec/common/inc/measure_time.h",
"src/codec/common/inc/memory_align.h",
"src/codec/common/inc/sad_common.h",
"src/codec/common/inc/typedefs.h",
"src/codec/common/inc/utils.h",
"src/codec/common/inc/version.h",
"src/codec/common/inc/welsCodecTrace.h",
"src/codec/common/inc/wels_common_defs.h",
"src/codec/common/inc/wels_const_common.h",
"src/codec/common/src/WelsThreadLib.cpp",
"src/codec/common/src/common_tables.cpp",
"src/codec/common/src/copy_mb.cpp",
"src/codec/common/src/cpu.cpp",
"src/codec/common/src/crt_util_safe_x.cpp",
"src/codec/common/src/deblocking_common.cpp",
"src/codec/common/src/expand_pic.cpp",
"src/codec/common/src/intra_pred_common.cpp",
"src/codec/common/src/mc.cpp",
"src/codec/common/src/memory_align.cpp",
"src/codec/common/src/sad_common.cpp",
"src/codec/common/src/utils.cpp",
"src/codec/common/src/welsCodecTrace.cpp",
]
include_dirs = [
"src/codec/api/svc",
"src/codec/common/inc",
"src/codec/common/src",
]
configs -= [ "//build/config/compiler:chromium_code" ] configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ]
configs += [ ":config" ] configs += [ ":config" ]
...@@ -51,8 +87,61 @@ source_set("common") { ...@@ -51,8 +87,61 @@ source_set("common") {
} }
source_set("processing") { source_set("processing") {
sources = openh264_gypi_values.openh264_processing_sources sources = [
include_dirs = openh264_gypi_values.openh264_processing_includes "src/codec/processing/interface/IWelsVP.h",
"src/codec/processing/src/adaptivequantization/AdaptiveQuantization.cpp",
"src/codec/processing/src/adaptivequantization/AdaptiveQuantization.h",
"src/codec/processing/src/backgrounddetection/BackgroundDetection.cpp",
"src/codec/processing/src/backgrounddetection/BackgroundDetection.h",
"src/codec/processing/src/common/WelsFrameWork.cpp",
"src/codec/processing/src/common/WelsFrameWork.h",
"src/codec/processing/src/common/WelsFrameWorkEx.cpp",
"src/codec/processing/src/common/common.h",
"src/codec/processing/src/common/memory.cpp",
"src/codec/processing/src/common/memory.h",
"src/codec/processing/src/common/resource.h",
"src/codec/processing/src/common/typedef.h",
"src/codec/processing/src/common/util.h",
"src/codec/processing/src/complexityanalysis/ComplexityAnalysis.cpp",
"src/codec/processing/src/complexityanalysis/ComplexityAnalysis.h",
"src/codec/processing/src/denoise/denoise.cpp",
"src/codec/processing/src/denoise/denoise.h",
"src/codec/processing/src/denoise/denoise_filter.cpp",
"src/codec/processing/src/downsample/downsample.cpp",
"src/codec/processing/src/downsample/downsample.h",
"src/codec/processing/src/downsample/downsamplefuncs.cpp",
"src/codec/processing/src/imagerotate/imagerotate.cpp",
"src/codec/processing/src/imagerotate/imagerotate.h",
"src/codec/processing/src/imagerotate/imagerotatefuncs.cpp",
"src/codec/processing/src/scenechangedetection/SceneChangeDetection.cpp",
"src/codec/processing/src/scenechangedetection/SceneChangeDetection.h",
"src/codec/processing/src/scrolldetection/ScrollDetection.cpp",
"src/codec/processing/src/scrolldetection/ScrollDetection.h",
"src/codec/processing/src/scrolldetection/ScrollDetectionFuncs.cpp",
"src/codec/processing/src/scrolldetection/ScrollDetectionFuncs.h",
"src/codec/processing/src/vaacalc/vaacalcfuncs.cpp",
"src/codec/processing/src/vaacalc/vaacalculation.cpp",
"src/codec/processing/src/vaacalc/vaacalculation.h",
]
include_dirs = [
"src/codec/api/svc",
"src/codec/common/inc",
"src/codec/common/src",
"src/codec/processing/interface",
"src/codec/processing/interface/",
"src/codec/processing/src/adaptivequantization",
"src/codec/processing/src/backgrounddetection",
"src/codec/processing/src/common",
"src/codec/processing/src/complexityanalysis",
"src/codec/processing/src/denoise",
"src/codec/processing/src/downsample",
"src/codec/processing/src/imagerotate",
"src/codec/processing/src/scenechangedetection",
"src/codec/processing/src/scrolldetection",
"src/codec/processing/src/vaacalc",
]
configs -= [ "//build/config/compiler:chromium_code" ] configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ]
configs += [ ":config" ] configs += [ ":config" ]
...@@ -62,8 +151,98 @@ source_set("processing") { ...@@ -62,8 +151,98 @@ source_set("processing") {
} }
source_set("encoder") { source_set("encoder") {
sources = openh264_gypi_values.openh264_encoder_sources sources = [
include_dirs = openh264_gypi_values.openh264_encoder_includes "src/codec/encoder/core/inc/as264_common.h",
"src/codec/encoder/core/inc/au_set.h",
"src/codec/encoder/core/inc/deblocking.h",
"src/codec/encoder/core/inc/decode_mb_aux.h",
"src/codec/encoder/core/inc/dq_map.h",
"src/codec/encoder/core/inc/encode_mb_aux.h",
"src/codec/encoder/core/inc/encoder.h",
"src/codec/encoder/core/inc/encoder_context.h",
"src/codec/encoder/core/inc/extern.h",
"src/codec/encoder/core/inc/get_intra_predictor.h",
"src/codec/encoder/core/inc/mb_cache.h",
"src/codec/encoder/core/inc/md.h",
"src/codec/encoder/core/inc/mt_defs.h",
"src/codec/encoder/core/inc/mv_pred.h",
"src/codec/encoder/core/inc/nal_encap.h",
"src/codec/encoder/core/inc/param_svc.h",
"src/codec/encoder/core/inc/parameter_sets.h",
"src/codec/encoder/core/inc/picture.h",
"src/codec/encoder/core/inc/picture_handle.h",
"src/codec/encoder/core/inc/property.h",
"src/codec/encoder/core/inc/rc.h",
"src/codec/encoder/core/inc/ref_list_mgr_svc.h",
"src/codec/encoder/core/inc/sample.h",
"src/codec/encoder/core/inc/set_mb_syn_cabac.h",
"src/codec/encoder/core/inc/set_mb_syn_cavlc.h",
"src/codec/encoder/core/inc/slice.h",
"src/codec/encoder/core/inc/slice_multi_threading.h",
"src/codec/encoder/core/inc/stat.h",
"src/codec/encoder/core/inc/svc_base_layer_md.h",
"src/codec/encoder/core/inc/svc_enc_frame.h",
"src/codec/encoder/core/inc/svc_enc_golomb.h",
"src/codec/encoder/core/inc/svc_enc_macroblock.h",
"src/codec/encoder/core/inc/svc_enc_slice_segment.h",
"src/codec/encoder/core/inc/svc_encode_mb.h",
"src/codec/encoder/core/inc/svc_encode_slice.h",
"src/codec/encoder/core/inc/svc_mode_decision.h",
"src/codec/encoder/core/inc/svc_motion_estimate.h",
"src/codec/encoder/core/inc/svc_set_mb_syn.h",
"src/codec/encoder/core/inc/svc_set_mb_syn_cavlc.h",
"src/codec/encoder/core/inc/vlc_encoder.h",
"src/codec/encoder/core/inc/wels_common_basis.h",
"src/codec/encoder/core/inc/wels_const.h",
"src/codec/encoder/core/inc/wels_func_ptr_def.h",
"src/codec/encoder/core/inc/wels_preprocess.h",
"src/codec/encoder/core/inc/wels_transpose_matrix.h",
"src/codec/encoder/core/src/au_set.cpp",
"src/codec/encoder/core/src/deblocking.cpp",
"src/codec/encoder/core/src/decode_mb_aux.cpp",
"src/codec/encoder/core/src/encode_mb_aux.cpp",
"src/codec/encoder/core/src/encoder.cpp",
"src/codec/encoder/core/src/encoder_data_tables.cpp",
"src/codec/encoder/core/src/encoder_ext.cpp",
"src/codec/encoder/core/src/get_intra_predictor.cpp",
"src/codec/encoder/core/src/md.cpp",
"src/codec/encoder/core/src/mv_pred.cpp",
"src/codec/encoder/core/src/nal_encap.cpp",
"src/codec/encoder/core/src/picture_handle.cpp",
"src/codec/encoder/core/src/property.cpp",
"src/codec/encoder/core/src/ratectl.cpp",
"src/codec/encoder/core/src/ref_list_mgr_svc.cpp",
"src/codec/encoder/core/src/sample.cpp",
"src/codec/encoder/core/src/set_mb_syn_cabac.cpp",
"src/codec/encoder/core/src/set_mb_syn_cavlc.cpp",
"src/codec/encoder/core/src/slice_multi_threading.cpp",
"src/codec/encoder/core/src/svc_base_layer_md.cpp",
"src/codec/encoder/core/src/svc_enc_slice_segment.cpp",
"src/codec/encoder/core/src/svc_encode_mb.cpp",
"src/codec/encoder/core/src/svc_encode_slice.cpp",
"src/codec/encoder/core/src/svc_mode_decision.cpp",
"src/codec/encoder/core/src/svc_motion_estimate.cpp",
"src/codec/encoder/core/src/svc_set_mb_syn_cabac.cpp",
"src/codec/encoder/core/src/svc_set_mb_syn_cavlc.cpp",
"src/codec/encoder/core/src/wels_preprocess.cpp",
"src/codec/encoder/plus/inc/welsEncoderExt.h",
"src/codec/encoder/plus/src/welsEncoderExt.cpp",
# Note: Purposefully excluded: 'src/codec/encoder/plus/src/DllEntry.cpp',
# This file is not built by the OpenH264 original build files.
]
include_dirs = [
"src/codec/api/svc",
"src/codec/common/inc",
"src/codec/common/src",
"src/codec/encoder/core/inc",
"src/codec/encoder/core/src",
"src/codec/encoder/plus/inc",
"src/codec/encoder/plus/src",
"src/codec/processing/interface",
]
configs -= [ "//build/config/compiler:chromium_code" ] configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ]
configs += [ ":config" ] configs += [ ":config" ]
......
third_party/openh264/openh264.gyp deleted 100644 → 0
View file @ 9c63d444
# Copyright 2015 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.
{
'includes': [
'openh264.gypi',
'openh264_args.gypi',
],
# Settings shared by all openh264 targets.
'target_defaults': {
'conditions': [
['OS!="win"', {
# GCC and clang flags.
'variables': {
'openh264_cflags_add': [
'-Wno-format',
'-Wno-unused-value',
],
'openh264_cflags_remove': [
'-Wall',
'-Wheader-hygiene',
],
},
'cflags': [ '<@(openh264_cflags_add)' ],
'cflags!': [ '<@(openh264_cflags_remove)' ],
'xcode_settings': {
'WARNING_CFLAGS': [ '<@(openh264_cflags_add)' ],
'WARNING_CFLAGS!': [ '<@(openh264_cflags_remove)' ],
},
}, {
# The land of special cases: Windows.
'conditions': [
['clang==0', {
# MSVS compiler uses warning numbers instead of cflags.
'msvs_disabled_warnings': [
4324, # structure was padded
4245, # signed/unsigned mismatch
4701, # uninitialized variable used
4702, # unreachable code
],
}, {
# For clang on windows, |cflags| is mysteriously ignored and we
# resort to using |AdditionalOptions| instead.
'msvs_settings': {
'VCCLCompilerTool': {
'AdditionalOptions': [
'-Wno-unused-function',
'-Wno-unused-value',
],
'AdditionalOptions!': [
'-Wheader-hygiene',
],
},
},
}],
],
}],
['OS=="android"', {
'defines': [
# Android NDK is necessary for its cpufeatures and this define is
# what OpenH264 code uses to check if it should be used.
'ANDROID_NDK',
],
}],
],
},
'targets': [
{
'target_name': 'openh264_common',
'type': 'static_library',
'conditions': [
['OS=="android"', {
'dependencies': [
# Defines "android_get/setCpu..." functions. The original
# OpenH264 build files replaces these using macros for
# "wels_..." versions of the same functions. We do not have
# access to these and use the <cpu-features.h> ones instead.
'<(DEPTH)/build/android/ndk.gyp:cpu_features',
],
}],
],
'include_dirs+': [ '<@(openh264_common_includes)' ],
'sources': [ '<@(openh264_common_sources)' ],
},
{
'target_name': 'openh264_processing',
'type': 'static_library',
'dependencies': [
'openh264_common',
],
'include_dirs+': [ '<@(openh264_processing_includes)' ],
'sources': [ '<@(openh264_processing_sources)' ],
},
{
'target_name': 'openh264_encoder',
'type': 'static_library',
'dependencies': [
'openh264_common',
'openh264_processing',
],
'include_dirs+': [ '<@(openh264_encoder_includes)' ],
'sources': [ '<@(openh264_encoder_sources)' ],
},
],
}
third_party/openh264/openh264.gypi deleted 100644 → 0
View file @ 9c63d444
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment