| commit | 9aa3f0a2006dfc7278e0c93cd073d4bbb190b796 | [log] [tgz] |
|---|---|---|
| author | mbonadei <mbonadei@webrtc.org> | Tue Jan 24 14:58:22 2017 |
| committer | Commit bot <commit-bot@chromium.org> | Tue Jan 24 14:58:22 2017 |
| tree | f5c9ba7652626778784410f0c82a13efbd5b3e40 | |
| parent | b54c63ffb0191eb25ec0cead534bfcbe4f5cffe7 [diff] [blame] |
Reland of Moving webrtc.gni up one level from build/ (patchset #1 id:1 of https://codereview.webrtc.org/2657563002/ ) Reason for revert: Starting to work on a fix (it seems that there are third_party dependencies that depends on the path to the webrtc.gni file) Original issue's description: > Revert of Moving webrtc.gni up one level from build/ (patchset #1 id:1 of https://codereview.webrtc.org/2651543003/ ) > > Reason for revert: > This was causing the following failure: https://build.chromium.org/p/chromium.webrtc.fyi/builders/Android%20Builder/builds/838/steps/generate_build_files/logs/stdio > > Original issue's description: > > Moving webrtc.gni up one level from build/ > > > > BUG=webrtc:7030 > > > > Review-Url: https://codereview.webrtc.org/2651543003 > > Cr-Commit-Position: refs/heads/master@{#16241} > > Committed: https://chromium.googlesource.com/external/webrtc/+/35a32700fc9b5d932ddbd528c12f59c3274e4774 > > TBR=kjellander@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:7030 > > Review-Url: https://codereview.webrtc.org/2657563002 > Cr-Commit-Position: refs/heads/master@{#16244} > Committed: https://chromium.googlesource.com/external/webrtc/+/69dc7dbe247ead087f3bae0eb7e23f27f0de1ec3 TBR=kjellander@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:7030 Review-Url: https://codereview.webrtc.org/2654773002 Cr-Commit-Position: refs/heads/master@{#16247}
diff --git a/webrtc/media/BUILD.gn b/webrtc/media/BUILD.gn index 7f8a1f6..06aed45 100644 --- a/webrtc/media/BUILD.gn +++ b/webrtc/media/BUILD.gn
@@ -7,7 +7,7 @@ # be found in the AUTHORS file in the root of the source tree. import("//build/config/linux/pkg_config.gni") -import("../build/webrtc.gni") +import("../webrtc.gni") group("media") { public_deps = [