Skip to content

Commit

Permalink
Moving src/webrtc into src/.
Browse files Browse the repository at this point in the history
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}
  • Loading branch information
MirkoBonadei authored and Commit Bot committed Sep 15, 2017
1 parent 6674846 commit bb54720
Show file tree
Hide file tree
Showing 4,576 changed files with 1,092 additions and 1,196 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
553 changes: 543 additions & 10 deletions BUILD.gn

Large diffs are not rendered by default.

35 changes: 35 additions & 0 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -542,3 +542,38 @@ recursedeps = [
# android_tools manages the NDK.
'src/third_party/android_tools',
]

# 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",
"+external/webrtc/webrtc", # Android platform build.
"+gflags",
"+libyuv",
"-webrtc", # Has to be disabled; otherwise all dirs below will be allowed.
# Individual headers that will be moved out of here, see webrtc:4243.
"+webrtc/call/rtp_config.h",
"+webrtc/common_types.h",
"+webrtc/transport.h",
"+webrtc/typedefs.h",
"+webrtc/voice_engine_configurations.h",

"+WebRTC",
"+webrtc/api",
"+webrtc/modules/include",
"+webrtc/rtc_base",
"+webrtc/test",
"+webrtc/rtc_tools",
]

# The below rules will be removed when webrtc:4243 is fixed.
specific_include_rules = {
"video_receive_stream\.h": [
"+webrtc/call/video_receive_stream.h",
],
"video_send_stream\.h": [
"+webrtc/call/video_send_stream.h",
],
}
30 changes: 29 additions & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1 +1,29 @@
Refer to webrtc/LICENSE.
Copyright (c) 2011, The WebRTC project authors. All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.

* Neither the name of Google nor the names of its contributors may
be used to endorse or promote products derived from this software
without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Loading

0 comments on commit bb54720

Please sign in to comment.