commit | 69dc7dbe247ead087f3bae0eb7e23f27f0de1ec3 | [log] [tgz] |
---|---|---|
author | mbonadei <mbonadei@webrtc.org> | Tue Jan 24 05:14:35 2017 -0800 |
committer | Commit bot <commit-bot@chromium.org> | Tue Jan 24 13:14:35 2017 +0000 |
tree | 7e4f3eaeb59269d0cf1b146d87b4d7d95016460a | |
parent | e6b4723790056e7312931c4694f37416d19fdc08 [diff] [blame] |
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}
diff --git a/webrtc/api/BUILD.gn b/webrtc/api/BUILD.gn index 038766a..af49219 100644 --- a/webrtc/api/BUILD.gn +++ b/webrtc/api/BUILD.gn
@@ -6,7 +6,7 @@ # in the file PATENTS. All contributing project authors may # be found in the AUTHORS file in the root of the source tree. -import("../webrtc.gni") +import("../build/webrtc.gni") if (is_android) { import("//build/config/android/config.gni") import("//build/config/android/rules.gni")