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: ceefe20dd6
>
> 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: 9b0dc622d4

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}

webrtc/api/BUILD.gn

@@ -147,27 +147,27 @@ if (is_android && !build_with_chromium) {
 
   source_set("libjingle_peerconnection_jni") {
     sources = [
+      "android/jni/androidmediacodeccommon.h",
+      "android/jni/androidmediadecoder_jni.cc",
+      "android/jni/androidmediadecoder_jni.h",
+      "android/jni/androidmediaencoder_jni.cc",
+      "android/jni/androidmediaencoder_jni.h",
+      "android/jni/androidmetrics_jni.cc",
+      "android/jni/androidnetworkmonitor_jni.cc",
+      "android/jni/androidnetworkmonitor_jni.h",
+      "android/jni/androidvideocapturer_jni.cc",
+      "android/jni/androidvideocapturer_jni.h",
+      "android/jni/classreferenceholder.cc",
+      "android/jni/classreferenceholder.h",
+      "android/jni/jni_helpers.cc",
+      "android/jni/jni_helpers.h",
+      "android/jni/native_handle_impl.cc",
+      "android/jni/native_handle_impl.h",
+      "android/jni/peerconnection_jni.cc",
+      "android/jni/surfacetexturehelper_jni.cc",
+      "android/jni/surfacetexturehelper_jni.h",
       "androidvideocapturer.cc",
       "androidvideocapturer.h",
-      "java/jni/androidmediacodeccommon.h",
-      "java/jni/androidmediadecoder_jni.cc",
-      "java/jni/androidmediadecoder_jni.h",
-      "java/jni/androidmediaencoder_jni.cc",
-      "java/jni/androidmediaencoder_jni.h",
-      "java/jni/androidmetrics_jni.cc",
-      "java/jni/androidnetworkmonitor_jni.cc",
-      "java/jni/androidnetworkmonitor_jni.h",
-      "java/jni/androidvideocapturer_jni.cc",
-      "java/jni/androidvideocapturer_jni.h",
-      "java/jni/classreferenceholder.cc",
-      "java/jni/classreferenceholder.h",
-      "java/jni/jni_helpers.cc",
-      "java/jni/jni_helpers.h",
-      "java/jni/native_handle_impl.cc",
-      "java/jni/native_handle_impl.h",
-      "java/jni/peerconnection_jni.cc",
-      "java/jni/surfacetexturehelper_jni.cc",
-      "java/jni/surfacetexturehelper_jni.h",
     ]
 
     configs += [
@@ -213,7 +213,7 @@ if (is_android && !build_with_chromium) {
 
   shared_library("libjingle_peerconnection_so") {
     sources = [
-      "java/jni/jni_onload.cc",
+      "android/jni/jni_onload.cc",
     ]
 
     configs -= [ "//build/config/android:hide_native_jni_exports" ]
@@ -232,51 +232,51 @@ if (is_android && !build_with_chromium) {
       "../modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java",
       "../modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java",
       "../modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java",
-      "java/android/org/webrtc/Camera1Enumerator.java",
-      "java/android/org/webrtc/Camera2Capturer.java",
-      "java/android/org/webrtc/Camera2Enumerator.java",
-      "java/android/org/webrtc/CameraEnumerationAndroid.java",
-      "java/android/org/webrtc/CameraEnumerator.java",
-      "java/android/org/webrtc/CameraVideoCapturer.java",
-      "java/android/org/webrtc/EglBase.java",
-      "java/android/org/webrtc/EglBase10.java",
-      "java/android/org/webrtc/EglBase14.java",
-      "java/android/org/webrtc/GlRectDrawer.java",
-      "java/android/org/webrtc/GlShader.java",
-      "java/android/org/webrtc/GlTextureFrameBuffer.java",
-      "java/android/org/webrtc/GlUtil.java",
-      "java/android/org/webrtc/NetworkMonitor.java",
-      "java/android/org/webrtc/NetworkMonitorAutoDetect.java",
-      "java/android/org/webrtc/RendererCommon.java",
-      "java/android/org/webrtc/SurfaceTextureHelper.java",
-      "java/android/org/webrtc/SurfaceViewRenderer.java",
-      "java/android/org/webrtc/VideoCapturerAndroid.java",
-      "java/android/org/webrtc/VideoRendererGui.java",
-      "java/src/org/webrtc/AudioSource.java",
-      "java/src/org/webrtc/AudioTrack.java",
-      "java/src/org/webrtc/CallSessionFileRotatingLogSink.java",
-      "java/src/org/webrtc/DataChannel.java",
-      "java/src/org/webrtc/IceCandidate.java",
-      "java/src/org/webrtc/MediaCodecVideoDecoder.java",
-      "java/src/org/webrtc/MediaCodecVideoEncoder.java",
-      "java/src/org/webrtc/MediaConstraints.java",
-      "java/src/org/webrtc/MediaSource.java",
-      "java/src/org/webrtc/MediaStream.java",
-      "java/src/org/webrtc/MediaStreamTrack.java",
-      "java/src/org/webrtc/Metrics.java",
-      "java/src/org/webrtc/PeerConnection.java",
-      "java/src/org/webrtc/PeerConnectionFactory.java",
-      "java/src/org/webrtc/RtpParameters.java",
-      "java/src/org/webrtc/RtpReceiver.java",
-      "java/src/org/webrtc/RtpSender.java",
-      "java/src/org/webrtc/SdpObserver.java",
-      "java/src/org/webrtc/SessionDescription.java",
-      "java/src/org/webrtc/StatsObserver.java",
-      "java/src/org/webrtc/StatsReport.java",
-      "java/src/org/webrtc/VideoCapturer.java",
-      "java/src/org/webrtc/VideoRenderer.java",
-      "java/src/org/webrtc/VideoSource.java",
-      "java/src/org/webrtc/VideoTrack.java",
+      "android/java/src/org/webrtc/AudioSource.java",
+      "android/java/src/org/webrtc/AudioTrack.java",
+      "android/java/src/org/webrtc/CallSessionFileRotatingLogSink.java",
+      "android/java/src/org/webrtc/Camera1Enumerator.java",
+      "android/java/src/org/webrtc/Camera2Capturer.java",
+      "android/java/src/org/webrtc/Camera2Enumerator.java",
+      "android/java/src/org/webrtc/CameraEnumerationAndroid.java",
+      "android/java/src/org/webrtc/CameraEnumerator.java",
+      "android/java/src/org/webrtc/CameraVideoCapturer.java",
+      "android/java/src/org/webrtc/DataChannel.java",
+      "android/java/src/org/webrtc/EglBase.java",
+      "android/java/src/org/webrtc/EglBase10.java",
+      "android/java/src/org/webrtc/EglBase14.java",
+      "android/java/src/org/webrtc/GlRectDrawer.java",
+      "android/java/src/org/webrtc/GlShader.java",
+      "android/java/src/org/webrtc/GlTextureFrameBuffer.java",
+      "android/java/src/org/webrtc/GlUtil.java",
+      "android/java/src/org/webrtc/IceCandidate.java",
+      "android/java/src/org/webrtc/MediaCodecVideoDecoder.java",
+      "android/java/src/org/webrtc/MediaCodecVideoEncoder.java",
+      "android/java/src/org/webrtc/MediaConstraints.java",
+      "android/java/src/org/webrtc/MediaSource.java",
+      "android/java/src/org/webrtc/MediaStream.java",
+      "android/java/src/org/webrtc/MediaStreamTrack.java",
+      "android/java/src/org/webrtc/Metrics.java",
+      "android/java/src/org/webrtc/NetworkMonitor.java",
+      "android/java/src/org/webrtc/NetworkMonitorAutoDetect.java",
+      "android/java/src/org/webrtc/PeerConnection.java",
+      "android/java/src/org/webrtc/PeerConnectionFactory.java",
+      "android/java/src/org/webrtc/RendererCommon.java",
+      "android/java/src/org/webrtc/RtpParameters.java",
+      "android/java/src/org/webrtc/RtpReceiver.java",
+      "android/java/src/org/webrtc/RtpSender.java",
+      "android/java/src/org/webrtc/SdpObserver.java",
+      "android/java/src/org/webrtc/SessionDescription.java",
+      "android/java/src/org/webrtc/StatsObserver.java",
+      "android/java/src/org/webrtc/StatsReport.java",
+      "android/java/src/org/webrtc/SurfaceTextureHelper.java",
+      "android/java/src/org/webrtc/SurfaceViewRenderer.java",
+      "android/java/src/org/webrtc/VideoCapturer.java",
+      "android/java/src/org/webrtc/VideoCapturerAndroid.java",
+      "android/java/src/org/webrtc/VideoRenderer.java",
+      "android/java/src/org/webrtc/VideoRendererGui.java",
+      "android/java/src/org/webrtc/VideoSource.java",
+      "android/java/src/org/webrtc/VideoTrack.java",
     ]
 
     deps = [

webrtc/api/android/jni/androidmediacodeccommon.h

@@ -15,8 +15,8 @@
 #include <string>
 
 #include "webrtc/base/thread.h"
-#include "webrtc/api/java/jni/classreferenceholder.h"
-#include "webrtc/api/java/jni/jni_helpers.h"
+#include "webrtc/api/android/jni/classreferenceholder.h"
+#include "webrtc/api/android/jni/jni_helpers.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/thread.h"
 

webrtc/api/android/jni/androidmediadecoder_jni.cc

@@ -14,15 +14,15 @@
 
 // NOTICE: androidmediadecoder_jni.h must be included before
 // androidmediacodeccommon.h to avoid build errors.
-#include "webrtc/api/java/jni/androidmediadecoder_jni.h"
+#include "webrtc/api/android/jni/androidmediadecoder_jni.h"
 
 #include "third_party/libyuv/include/libyuv/convert.h"
 #include "third_party/libyuv/include/libyuv/convert_from.h"
 #include "third_party/libyuv/include/libyuv/video_common.h"
-#include "webrtc/api/java/jni/androidmediacodeccommon.h"
-#include "webrtc/api/java/jni/classreferenceholder.h"
-#include "webrtc/api/java/jni/native_handle_impl.h"
-#include "webrtc/api/java/jni/surfacetexturehelper_jni.h"
+#include "webrtc/api/android/jni/androidmediacodeccommon.h"
+#include "webrtc/api/android/jni/classreferenceholder.h"
+#include "webrtc/api/android/jni/native_handle_impl.h"
+#include "webrtc/api/android/jni/surfacetexturehelper_jni.h"
 #include "webrtc/base/bind.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"

webrtc/api/android/jni/androidmediadecoder_jni.h

@@ -11,7 +11,7 @@
 #ifndef WEBRTC_API_JAVA_JNI_ANDROIDMEDIADECODER_JNI_H_
 #define WEBRTC_API_JAVA_JNI_ANDROIDMEDIADECODER_JNI_H_
 
-#include "webrtc/api/java/jni/jni_helpers.h"
+#include "webrtc/api/android/jni/jni_helpers.h"
 #include "webrtc/media/engine/webrtcvideodecoderfactory.h"
 
 namespace webrtc_jni {

webrtc/api/android/jni/androidmediaencoder_jni.cc

@@ -10,7 +10,7 @@
 
 // NOTICE: androidmediaencoder_jni.h must be included before
 // androidmediacodeccommon.h to avoid build errors.
-#include "webrtc/api/java/jni/androidmediaencoder_jni.h"
+#include "webrtc/api/android/jni/androidmediaencoder_jni.h"
 
 #include <algorithm>
 #include <memory>
@@ -19,9 +19,9 @@
 #include "third_party/libyuv/include/libyuv/convert.h"
 #include "third_party/libyuv/include/libyuv/convert_from.h"
 #include "third_party/libyuv/include/libyuv/video_common.h"
-#include "webrtc/api/java/jni/androidmediacodeccommon.h"
-#include "webrtc/api/java/jni/classreferenceholder.h"
-#include "webrtc/api/java/jni/native_handle_impl.h"
+#include "webrtc/api/android/jni/androidmediacodeccommon.h"
+#include "webrtc/api/android/jni/classreferenceholder.h"
+#include "webrtc/api/android/jni/native_handle_impl.h"
 #include "webrtc/base/bind.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"

webrtc/api/android/jni/androidmediaencoder_jni.h

@@ -13,7 +13,7 @@
 
 #include <vector>
 
-#include "webrtc/api/java/jni/jni_helpers.h"
+#include "webrtc/api/android/jni/jni_helpers.h"
 #include "webrtc/media/engine/webrtcvideoencoderfactory.h"
 
 namespace webrtc_jni {

webrtc/api/android/jni/androidmetrics_jni.cc

@@ -11,9 +11,9 @@
 #include <map>
 #include <memory>
 
-#include "webrtc/api/java/jni/classreferenceholder.h"
-#include "webrtc/api/java/jni/jni_helpers.h"
-#include "webrtc/api/java/jni/native_handle_impl.h"
+#include "webrtc/api/android/jni/classreferenceholder.h"
+#include "webrtc/api/android/jni/jni_helpers.h"
+#include "webrtc/api/android/jni/native_handle_impl.h"
 #include "webrtc/system_wrappers/include/metrics_default.h"
 
 // Enables collection of native histograms.

webrtc/api/android/jni/androidnetworkmonitor_jni.cc

@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/api/java/jni/androidnetworkmonitor_jni.h"
+#include "webrtc/api/android/jni/androidnetworkmonitor_jni.h"
 
 #include <dlfcn.h>
 
-#include "webrtc/api/java/jni/classreferenceholder.h"
-#include "webrtc/api/java/jni/jni_helpers.h"
+#include "webrtc/api/android/jni/classreferenceholder.h"
+#include "webrtc/api/android/jni/jni_helpers.h"
 #include "webrtc/base/bind.h"
 #include "webrtc/base/common.h"
 #include "webrtc/base/ipaddress.h"

webrtc/api/android/jni/androidnetworkmonitor_jni.h

@@ -15,7 +15,7 @@
 
 #include <map>
 
-#include "webrtc/api/java/jni/jni_helpers.h"
+#include "webrtc/api/android/jni/jni_helpers.h"
 #include "webrtc/base/basictypes.h"
 #include "webrtc/base/thread_checker.h"
 

webrtc/api/android/jni/androidvideocapturer_jni.cc

@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/api/java/jni/androidvideocapturer_jni.h"
-#include "webrtc/api/java/jni/classreferenceholder.h"
-#include "webrtc/api/java/jni/native_handle_impl.h"
-#include "webrtc/api/java/jni/surfacetexturehelper_jni.h"
+#include "webrtc/api/android/jni/androidvideocapturer_jni.h"
+#include "webrtc/api/android/jni/classreferenceholder.h"
+#include "webrtc/api/android/jni/native_handle_impl.h"
+#include "webrtc/api/android/jni/surfacetexturehelper_jni.h"
 #include "third_party/libyuv/include/libyuv/convert.h"
 #include "webrtc/base/bind.h"
 

webrtc/api/android/jni/androidvideocapturer_jni.h

@@ -15,7 +15,7 @@
 #include <string>
 
 #include "webrtc/api/androidvideocapturer.h"
-#include "webrtc/api/java/jni/jni_helpers.h"
+#include "webrtc/api/android/jni/jni_helpers.h"
 #include "webrtc/base/asyncinvoker.h"
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/criticalsection.h"

webrtc/api/android/jni/classreferenceholder.cc

@@ -7,9 +7,9 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-#include "webrtc/api/java/jni/classreferenceholder.h"
+#include "webrtc/api/android/jni/classreferenceholder.h"
 
-#include "webrtc/api/java/jni/jni_helpers.h"
+#include "webrtc/api/android/jni/jni_helpers.h"
 
 namespace webrtc_jni {
 

webrtc/api/android/jni/jni_helpers.cc

@@ -7,9 +7,9 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-#include "webrtc/api/java/jni/jni_helpers.h"
+#include "webrtc/api/android/jni/jni_helpers.h"
 
-#include "webrtc/api/java/jni/classreferenceholder.h"
+#include "webrtc/api/android/jni/classreferenceholder.h"
 
 #include <asm/unistd.h>
 #include <sys/prctl.h>

webrtc/api/android/jni/jni_onload.cc

@@ -12,8 +12,8 @@
 #undef JNIEXPORT
 #define JNIEXPORT __attribute__((visibility("default")))
 
-#include "webrtc/api/java/jni/classreferenceholder.h"
-#include "webrtc/api/java/jni/jni_helpers.h"
+#include "webrtc/api/android/jni/classreferenceholder.h"
+#include "webrtc/api/android/jni/jni_helpers.h"
 #include "webrtc/base/ssladapter.h"
 
 namespace webrtc_jni {

webrtc/api/android/jni/native_handle_impl.cc

@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/api/java/jni/native_handle_impl.h"
+#include "webrtc/api/android/jni/native_handle_impl.h"
 
 #include <memory>
 
-#include "webrtc/api/java/jni/jni_helpers.h"
+#include "webrtc/api/android/jni/jni_helpers.h"
 #include "webrtc/base/bind.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/keep_ref_until_done.h"

webrtc/api/android/jni/peerconnection_jni.cc

@@ -45,13 +45,13 @@
 
 #include "webrtc/api/androidvideocapturer.h"
 #include "webrtc/api/dtlsidentitystore.h"
-#include "webrtc/api/java/jni/androidmediadecoder_jni.h"
-#include "webrtc/api/java/jni/androidmediaencoder_jni.h"
-#include "webrtc/api/java/jni/androidnetworkmonitor_jni.h"
-#include "webrtc/api/java/jni/androidvideocapturer_jni.h"
-#include "webrtc/api/java/jni/classreferenceholder.h"
-#include "webrtc/api/java/jni/jni_helpers.h"
-#include "webrtc/api/java/jni/native_handle_impl.h"
+#include "webrtc/api/android/jni/androidmediadecoder_jni.h"
+#include "webrtc/api/android/jni/androidmediaencoder_jni.h"
+#include "webrtc/api/android/jni/androidnetworkmonitor_jni.h"
+#include "webrtc/api/android/jni/androidvideocapturer_jni.h"
+#include "webrtc/api/android/jni/classreferenceholder.h"
+#include "webrtc/api/android/jni/jni_helpers.h"
+#include "webrtc/api/android/jni/native_handle_impl.h"
 #include "webrtc/api/mediaconstraintsinterface.h"
 #include "webrtc/api/peerconnectioninterface.h"
 #include "webrtc/api/rtpreceiverinterface.h"

webrtc/api/android/jni/surfacetexturehelper_jni.cc

@@ -9,9 +9,9 @@
  */
 
 
-#include "webrtc/api/java/jni/surfacetexturehelper_jni.h"
+#include "webrtc/api/android/jni/surfacetexturehelper_jni.h"
 
-#include "webrtc/api/java/jni/classreferenceholder.h"
+#include "webrtc/api/android/jni/classreferenceholder.h"
 #include "webrtc/base/bind.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"

webrtc/api/android/jni/surfacetexturehelper_jni.h

@@ -13,8 +13,8 @@
 
 #include <jni.h>
 
-#include "webrtc/api/java/jni/jni_helpers.h"
-#include "webrtc/api/java/jni/native_handle_impl.h"
+#include "webrtc/api/android/jni/jni_helpers.h"
+#include "webrtc/api/android/jni/native_handle_impl.h"
 #include "webrtc/base/refcount.h"
 #include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/common_video/include/video_frame_buffer.h"

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"

webrtc/api/api.gyp

@@ -35,27 +35,27 @@
             'libjingle_peerconnection',
           ],
           'sources': [
+            'android/jni/androidmediacodeccommon.h',
+            'android/jni/androidmediadecoder_jni.cc',
+            'android/jni/androidmediadecoder_jni.h',
+            'android/jni/androidmediaencoder_jni.cc',
+            'android/jni/androidmediaencoder_jni.h',
+            'android/jni/androidmetrics_jni.cc',
+            'android/jni/androidnetworkmonitor_jni.cc',
+            'android/jni/androidnetworkmonitor_jni.h',
+            'android/jni/androidvideocapturer_jni.cc',
+            'android/jni/androidvideocapturer_jni.h',
+            'android/jni/classreferenceholder.cc',
+            'android/jni/classreferenceholder.h',
+            'android/jni/jni_helpers.cc',
+            'android/jni/jni_helpers.h',
+            'android/jni/native_handle_impl.cc',
+            'android/jni/native_handle_impl.h',
+            'android/jni/peerconnection_jni.cc',
+            'android/jni/surfacetexturehelper_jni.cc',
+            'android/jni/surfacetexturehelper_jni.h',
             'androidvideocapturer.cc',
             'androidvideocapturer.h',
-            'java/jni/androidmediacodeccommon.h',
-            'java/jni/androidmediadecoder_jni.cc',
-            'java/jni/androidmediadecoder_jni.h',
-            'java/jni/androidmediaencoder_jni.cc',
-            'java/jni/androidmediaencoder_jni.h',
-            'java/jni/androidmetrics_jni.cc',
-            'java/jni/androidnetworkmonitor_jni.cc',
-            'java/jni/androidnetworkmonitor_jni.h',
-            'java/jni/androidvideocapturer_jni.cc',
-            'java/jni/androidvideocapturer_jni.h',
-            'java/jni/surfacetexturehelper_jni.cc',
-            'java/jni/surfacetexturehelper_jni.h',
-            'java/jni/classreferenceholder.cc',
-            'java/jni/classreferenceholder.h',
-            'java/jni/jni_helpers.cc',
-            'java/jni/jni_helpers.h',
-            'java/jni/native_handle_impl.cc',
-            'java/jni/native_handle_impl.h',
-            'java/jni/peerconnection_jni.cc',
           ],
           'include_dirs': [
             '<(libyuv_dir)/include',
@@ -83,7 +83,7 @@
             'libjingle_peerconnection_jni',
           ],
           'sources': [
-           'java/jni/jni_onload.cc',
+           'android/jni/jni_onload.cc',
           ],
           'variables': {
             # This library uses native JNI exports; tell GYP so that the

webrtc/api/api_java.gyp

@@ -34,14 +34,12 @@
             'android_manifest_path': '<(webrtc_root)/build/android/AndroidManifest.xml',
             'suppressions_file': '<(webrtc_root)/build/android/suppressions.xml',
             'chromium_code': 1,
-            'java_in_dir': 'java',
+            'java_in_dir': 'android/java',
             'webrtc_base_dir': '<(webrtc_root)/base',
             'webrtc_modules_dir': '<(webrtc_root)/modules',
             'additional_src_dirs' : [
-              'java/android',
-              '<(webrtc_base_dir)/java/src',
+              '<(webrtc_base_dir)/java',
               '<(webrtc_modules_dir)/audio_device/android/java/src',
-
             ],
           },
           'includes': ['../../build/java.gypi'],

webrtc/api/test/androidtestinitializer.cc

@@ -19,8 +19,8 @@
 #include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 
-#include "webrtc/api/java/jni/classreferenceholder.h"
-#include "webrtc/api/java/jni/jni_helpers.h"
+#include "webrtc/api/android/jni/classreferenceholder.h"
+#include "webrtc/api/android/jni/jni_helpers.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/ssladapter.h"
 #include "webrtc/voice_engine/include/voe_base.h"