This reverts commit e9bdfd859c.
This CL makes the GN chrome bot fail, not really sure why...
FAILED: /mnt/data/b/build/goma/gomacc
../../third_party/llvm-build/Release+Asserts/bin/clang++ -MMD -MF
obj/third_party/webrtc/modules/audio_coding/main/acm2/acm_dump.acm_dump.o.d
-DRTC_AUDIOCODING_DEBUG_DUMP -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2
-DENABLE_MDNS=1 -DENABLE_NOTIFICATIONS -DENABLE_PEPPER_CDMS -DENABLE_PLUGINS=1
-DENABLE_PRINTING=1 -DENABLE_BASIC_PRINTING=1 -DENABLE_PRINT_PREVIEW=1
-DENABLE_SPELLCHECK=1 -DDONT_EMBED_BUILD_METADATA -DUSE_UDEV
-DUI_COMPOSITOR_IMAGE_TRANSPORT -DUSE_ASH=1 -DUSE_AURA=1 -DUSE_PANGO=1
-DUSE_CAIRO=1 -DUSE_CLIPBOARD_AURAX11=1 -DUSE_DEFAULT_RENDER_THEME=1
-DUSE_GLIB=1 -DUSE_NSS_CERTS=1 -DUSE_X11=1 -DENABLE_WEBRTC=1
-DENABLE_EXTENSIONS=1 -DENABLE_CONFIGURATION_POLICY -DENABLE_TASK_MANAGER=1
-DENABLE_THEMES=1 -DENABLE_CAPTIVE_PORTAL_DETECTION=1 -DENABLE_SESSION_SERVICE=1
-DENABLE_APP_LIST=1 -DENABLE_SETTINGS_APP=1 -DENABLE_SUPERVISED_USERS=1
-DENABLE_SERVICE_DISCOVERY=1 -DENABLE_AUTOFILL_DIALOG=1 -DENABLE_REMOTING=1
-DENABLE_GOOGLE_NOW=1 -DENABLE_ONE_CLICK_SIGNIN -DENABLE_HIDPI=1
-DV8_USE_EXTERNAL_STARTUP_DATA -DENABLE_BACKGROUND=1 -DENABLE_PRE_SYNC_BACKUP
-DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL
-DSAFE_BROWSING_SERVICE -DCHROMIUM_BUILD -DENABLE_MEDIA_ROUTER=1
-DCR_CLANG_REVISION=239765-1 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-D_LARGEFILE64_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG
-DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DGOOGLE_PROTOBUF_NO_RTTI
-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -I../.. -Igen
-I../../third_party/protobuf/src -Igen/protoc_out
-I../../third_party/protobuf/src -I../../third_party/protobuf
-fno-strict-aliasing -fstack-protector --param=ssp-buffer-size=4 -m64
-march=x86-64 -funwind-tables -fPIC -pipe -pthread
-B../../third_party/binutils/Linux_x64/Release/bin -fcolor-diagnostics -Wall
-Wsign-compare -Wendif-labels -Werror -Wno-missing-field-initializers
-Wno-unused-parameter -Wno-c++11-narrowing -Wno-char-subscripts
-Wno-covered-switch-default -Wno-deprecated-register
-Wno-unneeded-internal-declaration -Wno-reserved-user-defined-literal
-Wno-inconsistent-missing-override -fvisibility=hidden -Xclang -load -Xclang
../../third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.so -Xclang
-plugin-arg-find-bad-constructs -Xclang check-templates -Xclang -add-plugin
-Xclang find-bad-constructs -Wheader-hygiene -Wstring-conversion -O2 -fno-ident
-fdata-sections -ffunction-sections -g1 -gsplit-dwarf -fno-threadsafe-statics
-fvisibility-inlines-hidden -std=gnu++11 -fno-rtti -fno-exceptions -c
../../third_party/webrtc/modules/audio_coding/main/acm2/acm_dump.cc -o
obj/third_party/webrtc/modules/audio_coding/main/acm2/acm_dump.acm_dump.o
../../third_party/webrtc/modules/audio_coding/main/acm2/acm_dump.cc:11:10: fatal
error: 'webrtc/modules/audio_coding/main/acm2/acm_dump.h' file not found
#include "webrtc/modules/audio_coding/main/acm2/acm_dump.h"
^
1 error generated.
ninja: build stopped: subcommand failed.
TBR=ivoc@webrtc.org
BUG=
Review URL: https://codereview.webrtc.org/1195963002.
Cr-Commit-Position: refs/heads/master@{#9474}
106 lines
3.4 KiB
Python
106 lines
3.4 KiB
Python
# This file contains dependencies for WebRTC that are not shared with Chromium.
|
|
# If you wish to add a dependency that is present in Chromium's src/DEPS or a
|
|
# directory from the Chromium checkout, you should add it to setup_links.py
|
|
# instead.
|
|
|
|
vars = {
|
|
'extra_gyp_flag': '-Dextra_gyp_flag=0',
|
|
'chromium_git': 'https://chromium.googlesource.com',
|
|
'chromium_revision': '6e6b751edaef93725d8ecd8142c32704bfe422e7',
|
|
}
|
|
|
|
# NOTE: Prefer revision numbers to tags for svn deps. Use http rather than
|
|
# https; the latter can cause problems for users behind proxies.
|
|
deps = {
|
|
# When rolling gflags, also update
|
|
# https://chromium.googlesource.com/chromium/deps/webrtc/webrtc.DEPS
|
|
'src/third_party/gflags/src':
|
|
Var('chromium_git') + '/external/gflags/src@e7390f9185c75f8d902c05ed7d20bb94eb914d0c', # from svn revision 82
|
|
|
|
'src/third_party/junit-jar':
|
|
Var('chromium_git') + '/external/webrtc/deps/third_party/junit@f35596b476aa6e62fd3b3857b9942ddcd13ce35e', # from svn revision 3367
|
|
}
|
|
|
|
deps_os = {
|
|
'win': {
|
|
'src/third_party/winsdk_samples/src':
|
|
Var('chromium_git') + '/external/webrtc/deps/third_party/winsdk_samples_v71@c0cbedd854cb610a53226d9817416c4ab9a7d1e9', # from svn revision 7951
|
|
},
|
|
}
|
|
|
|
# Define rules for which include paths are allowed in our source.
|
|
include_rules = [
|
|
# Base is only used to build Android APK tests and may not be referenced by
|
|
# WebRTC production code.
|
|
'-base',
|
|
'-chromium',
|
|
'+gflags',
|
|
'+libyuv',
|
|
'+net',
|
|
'+talk',
|
|
'+testing',
|
|
'+third_party',
|
|
'+unicode',
|
|
'+webrtc',
|
|
'+vpx',
|
|
]
|
|
|
|
# checkdeps.py shouldn't check include paths for files in these dirs:
|
|
skip_child_includes = [
|
|
'webrtc/overrides',
|
|
]
|
|
|
|
hooks = [
|
|
{
|
|
# Check for legacy named top-level dir (named 'trunk').
|
|
'name': 'check_root_dir_name',
|
|
'pattern': '.',
|
|
'action': ['python','-c',
|
|
('import os,sys;'
|
|
'script = os.path.join("trunk","check_root_dir.py");'
|
|
'_ = os.system("%s %s" % (sys.executable,script)) '
|
|
'if os.path.exists(script) else 0')],
|
|
},
|
|
{
|
|
# Clone chromium and its deps.
|
|
'name': 'sync chromium',
|
|
'pattern': '.',
|
|
'action': ['python', '-u', 'src/sync_chromium.py',
|
|
'--target-revision', Var('chromium_revision')],
|
|
},
|
|
{
|
|
# Create links to shared dependencies in Chromium.
|
|
'name': 'setup_links',
|
|
'pattern': '.',
|
|
'action': ['python', 'src/setup_links.py'],
|
|
},
|
|
{
|
|
# Pull sanitizer-instrumented third-party libraries if requested via
|
|
# GYP_DEFINES. This could be done as part of sync_chromium.py above
|
|
# but then we would need to run all the Chromium hooks each time,
|
|
# which will slow things down a lot.
|
|
'name': 'instrumented_libraries',
|
|
'pattern': '\\.sha1',
|
|
'action': ['python', 'src/third_party/instrumented_libraries/scripts/download_binaries.py'],
|
|
},
|
|
{
|
|
# Download test resources, i.e. video and audio files from Google Storage.
|
|
'pattern': '.',
|
|
'action': ['download_from_google_storage',
|
|
'--directory',
|
|
'--recursive',
|
|
'--num_threads=10',
|
|
'--no_auth',
|
|
'--bucket', 'chromium-webrtc-resources',
|
|
'src/resources'],
|
|
},
|
|
{
|
|
# A change to a .gyp, .gypi, or to GYP itself should run the generator.
|
|
'name': 'gyp',
|
|
'pattern': '.',
|
|
'action': ['python', 'src/webrtc/build/gyp_webrtc',
|
|
Var('extra_gyp_flag')],
|
|
},
|
|
]
|
|
|