Revert of Combine webrtc/api/java/android and webrtc/api/java/src.

webrtc/api/api.gyp

 # Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 {
   'includes': [ '../build/common.gypi', ],
@@ skipping 17 matching lines @@
       'targets': [
         {
           'target_name': 'libjingle_peerconnection_jni',
           'type': 'static_library',
           'dependencies': [
             '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_default',
             '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default',
             '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',
           ],
           # TODO(kjellander): Make the code compile without disabling these flags.
           # See https://bugs.chromium.org/p/webrtc/issues/detail?id=3307
           'cflags': [
             '-Wno-sign-compare',
             '-Wno-unused-variable',
           ],
           'cflags!': [
             '-Wextra',
           ],
           'msvs_disabled_warnings': [
             4245,  # conversion from 'int' to 'size_t', signed/unsigned mismatch.
             4267,  # conversion from 'size_t' to 'int', possible loss of data.
             4389,  # signed/unsigned mismatch.
           ],
         },
         {
           'target_name': 'libjingle_peerconnection_so',
           'type': 'shared_library',
           'dependencies': [
             'libjingle_peerconnection',
             'libjingle_peerconnection_jni',
           ],
           'sources': [
-           'android/jni/jni_onload.cc',
+           'java/jni/jni_onload.cc',
           ],
           'variables': {
             # This library uses native JNI exports; tell GYP so that the
             # required symbols will be kept.
             'use_native_jni_exports': 1,
           },
         },
       ]
     }],
   ],  # conditions
@@ skipping 97 matching lines @@
             'quicdatatransport.h',
           ],
           'export_dependent_settings': [
             '<(DEPTH)/third_party/libquic/libquic.gyp:libquic',
           ],
         }],
       ],
     },  # target libjingle_peerconnection
   ],  # targets
 }