Skip to content

Commit bb54720

Browse files
MirkoBonadeiCommit Bot
authored and
Commit Bot
committed
Moving src/webrtc into src/.
In order to eliminate the WebRTC Subtree mirror in Chromium, WebRTC is moving the content of the src/webrtc directory up to the src/ directory. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true [email protected] Bug: chromium:611808 Change-Id: Iac59c5b51b950f174119565bac87955a7994bc38 Reviewed-on: https://webrtc-review.googlesource.com/1560 Commit-Queue: Mirko Bonadei <[email protected]> Reviewed-by: Henrik Kjellander <[email protected]> Cr-Commit-Position: refs/heads/master@{#19845}
1 parent 6674846 commit bb54720

File tree

4,576 files changed

+1092
-1196
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,576 files changed

+1092
-1196
lines changed

BUILD.gn

+543-10
Large diffs are not rendered by default.

DEPS

+35
Original file line numberDiff line numberDiff line change
@@ -542,3 +542,38 @@ recursedeps = [
542542
# android_tools manages the NDK.
543543
'src/third_party/android_tools',
544544
]
545+
546+
# Define rules for which include paths are allowed in our source.
547+
include_rules = [
548+
# Base is only used to build Android APK tests and may not be referenced by
549+
# WebRTC production code.
550+
"-base",
551+
"-chromium",
552+
"+external/webrtc/webrtc", # Android platform build.
553+
"+gflags",
554+
"+libyuv",
555+
"-webrtc", # Has to be disabled; otherwise all dirs below will be allowed.
556+
# Individual headers that will be moved out of here, see webrtc:4243.
557+
"+webrtc/call/rtp_config.h",
558+
"+webrtc/common_types.h",
559+
"+webrtc/transport.h",
560+
"+webrtc/typedefs.h",
561+
"+webrtc/voice_engine_configurations.h",
562+
563+
"+WebRTC",
564+
"+webrtc/api",
565+
"+webrtc/modules/include",
566+
"+webrtc/rtc_base",
567+
"+webrtc/test",
568+
"+webrtc/rtc_tools",
569+
]
570+
571+
# The below rules will be removed when webrtc:4243 is fixed.
572+
specific_include_rules = {
573+
"video_receive_stream\.h": [
574+
"+webrtc/call/video_receive_stream.h",
575+
],
576+
"video_send_stream\.h": [
577+
"+webrtc/call/video_send_stream.h",
578+
],
579+
}

LICENSE

+29-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,29 @@
1-
Refer to webrtc/LICENSE.
1+
Copyright (c) 2011, The WebRTC project authors. All rights reserved.
2+
3+
Redistribution and use in source and binary forms, with or without
4+
modification, are permitted provided that the following conditions are
5+
met:
6+
7+
* Redistributions of source code must retain the above copyright
8+
notice, this list of conditions and the following disclaimer.
9+
10+
* Redistributions in binary form must reproduce the above copyright
11+
notice, this list of conditions and the following disclaimer in
12+
the documentation and/or other materials provided with the
13+
distribution.
14+
15+
* Neither the name of Google nor the names of its contributors may
16+
be used to endorse or promote products derived from this software
17+
without specific prior written permission.
18+
19+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
20+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
21+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
22+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
23+
HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
24+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
25+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

0 commit comments

Comments
 (0)