| commit | d34a711f224730e3602ad4e455cd876ed6061d7d | [log] [tgz] |
|---|---|---|
| author | sakal <sakal@webrtc.org> | Fri Jul 01 05:10:51 2016 -0700 |
| committer | Commit bot <commit-bot@chromium.org> | Fri Jul 01 12:10:59 2016 +0000 |
| tree | 03da0b5a59da1baca6c1e1d93f98059713930887 | |
| parent | e703f4133650ad9c17dc9d3e655608d1ec1eaffb [diff] [blame] |
Reland of Combine webrtc/api/java/android and webrtc/api/java/src. (patchset #1 id:1 of https://codereview.webrtc.org/2106333005/ ) Reason for revert: Issues fixed Original issue's description: > Revert of Combine webrtc/api/java/android and webrtc/api/java/src. (patchset #1 id:1 of https://codereview.webrtc.org/2111823002/ ) > > Reason for revert: > Breaks downstream dependencies > > Original issue's description: > > Combine webrtc/api/java/android and webrtc/api/java/src. > > > > It used to be that there was a Java api for devices not running Android > > but that is no longer the case. I combined the directories and made > > the folder structure chromium style. > > > > BUG=webrtc:6067 > > R=magjed@webrtc.org, tommi@webrtc.org > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/ceefe20dd65387d83059d9fc1ce84842650ed5e2 > > TBR=magjed@webrtc.org,tommi@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:6067 > > Committed: https://chromium.googlesource.com/external/webrtc/+/9b0dc622d46b6b09bb7ccaca6b2f68739c87ff8d TBR=magjed@webrtc.org,tommi@webrtc.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:6067 Review-Url: https://codereview.webrtc.org/2111923003 Cr-Commit-Position: refs/heads/master@{#13363}
diff --git a/webrtc/api/androidvideocapturer.cc b/webrtc/api/androidvideocapturer.cc index 22c7555..0bdf214 100644 --- a/webrtc/api/androidvideocapturer.cc +++ b/webrtc/api/androidvideocapturer.cc
@@ -12,7 +12,7 @@ #include <memory> -#include "webrtc/api/java/jni/native_handle_impl.h" +#include "webrtc/api/android/jni/native_handle_impl.h" #include "webrtc/base/common.h" #include "webrtc/base/timeutils.h" #include "webrtc/media/engine/webrtcvideoframe.h"