Mass refactoring: Change JNI #includes to use full paths (media/).

Using relative paths was causing build failures. To create this change: * find out/Debug -name *_jni.h -delete * find . -name BUILD.gn -exec sed -i '/jni_package =/d' {} \; * ninja $ALL_JNI_HEADERS minus third_party, chromecast, cronet, libassistant * refactor_jni_includes.py --out-dir out/Debug * fix DEPs files manually * split out media/ changes into this cl See https://groups.google.com/a/chromium.org/forum/?#!topic/java/MEovGrAwbqI for discussion on naming scheme. Bug: 964169 Change-Id: I6578acc70af2df7334dc3512540ca20813e5098c Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1671008 Commit-Queue: Mohamed Heikal <mheikal@chromium.org> Auto-Submit: Mohamed Heikal <mheikal@chromium.org> Reviewed-by: Frank Liberato <liberato@chromium.org> Cr-Commit-Position: refs/heads/master@{#671392}
marcosholgado · Jun 21, 2019 · cea8dd6 · cea8dd6
1 parent 9b2c3e8
commit cea8dd6
Show file tree

Hide file tree

Showing 26 changed files with 24 additions and 28 deletions.
diff --git a/media/DEPS b/media/DEPS
@@ -6,7 +6,7 @@ include_rules = [
   "+crypto",
   "+device/udev_linux",
   "+gpu",
-  "+jni",
+  "+media/midi/midi_jni_headers",
   "+mojo/public/cpp/bindings/callback_helpers.h",
   "+mojo/public/cpp/system/platform_handle.h",
   "+services/device/public",

diff --git a/media/audio/android/audio_manager_android.cc b/media/audio/android/audio_manager_android.cc
@@ -13,14 +13,14 @@
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
-#include "jni/AudioManagerAndroid_jni.h"
 #include "media/audio/android/audio_record_input.h"
 #include "media/audio/android/audio_track_output_stream.h"
 #include "media/audio/android/opensles_input.h"
 #include "media/audio/android/opensles_output.h"
 #include "media/audio/audio_device_description.h"
 #include "media/audio/audio_manager.h"
 #include "media/audio/fake_audio_input_stream.h"
+#include "media/base/android/media_jni_headers/AudioManagerAndroid_jni.h"
 #include "media/base/audio_parameters.h"
 #include "media/base/channel_layout.h"
 

diff --git a/media/audio/android/audio_record_input.cc b/media/audio/android/audio_record_input.cc
@@ -5,8 +5,8 @@
 #include "media/audio/android/audio_record_input.h"
 
 #include "base/logging.h"
-#include "jni/AudioRecordInput_jni.h"
 #include "media/audio/android/audio_manager_android.h"
+#include "media/base/android/media_jni_headers/AudioRecordInput_jni.h"
 #include "media/base/audio_bus.h"
 
 using base::android::JavaParamRef;

diff --git a/media/audio/android/audio_track_output_stream.cc b/media/audio/android/audio_track_output_stream.cc
@@ -11,8 +11,8 @@
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
 #include "base/time/default_tick_clock.h"
-#include "jni/AudioTrackOutputStream_jni.h"
 #include "media/audio/audio_manager_base.h"
+#include "media/base/android/media_jni_headers/AudioTrackOutputStream_jni.h"
 #include "media/base/audio_sample_types.h"
 #include "media/base/audio_timestamp_helper.h"
 

diff --git a/media/base/android/BUILD.gn b/media/base/android/BUILD.gn
@@ -144,7 +144,6 @@ if (is_android) {
       "java/src/org/chromium/media/MediaPlayerListener.java",
       "java/src/org/chromium/media/MediaServerCrashListener.java",
     ]
-    jni_package = "media"
   }
 
   java_cpp_enum("java_enums") {

diff --git a/media/base/android/jni_hdr_metadata.cc b/media/base/android/jni_hdr_metadata.cc
@@ -4,7 +4,7 @@
 
 #include "media/base/android/jni_hdr_metadata.h"
 
-#include "jni/HdrMetadata_jni.h"
+#include "media/base/android/media_jni_headers/HdrMetadata_jni.h"
 #include "media/base/hdr_metadata.h"
 #include "media/base/video_color_space.h"
 

diff --git a/media/base/android/media_codec_bridge_impl.cc b/media/base/android/media_codec_bridge_impl.cc
@@ -17,10 +17,10 @@
 #include "base/memory/ptr_util.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/string_util.h"
-#include "jni/MediaCodecBridgeBuilder_jni.h"
-#include "jni/MediaCodecBridge_jni.h"
 #include "media/base/android/jni_hdr_metadata.h"
 #include "media/base/android/media_codec_util.h"
+#include "media/base/android/media_jni_headers/MediaCodecBridgeBuilder_jni.h"
+#include "media/base/android/media_jni_headers/MediaCodecBridge_jni.h"
 #include "media/base/audio_codecs.h"
 #include "media/base/bit_reader.h"
 #include "media/base/subsample_entry.h"

diff --git a/media/base/android/media_codec_util.cc b/media/base/android/media_codec_util.cc
@@ -16,9 +16,9 @@
 #include "base/logging.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
-#include "jni/CodecProfileLevelList_jni.h"
-#include "jni/MediaCodecUtil_jni.h"
 #include "media/base/android/media_codec_bridge.h"
+#include "media/base/android/media_jni_headers/CodecProfileLevelList_jni.h"
+#include "media/base/android/media_jni_headers/MediaCodecUtil_jni.h"
 #include "media/base/video_codecs.h"
 #include "url/gurl.h"
 

diff --git a/media/base/android/media_drm_bridge.cc b/media/base/android/media_drm_bridge.cc
@@ -26,12 +26,12 @@
 #include "base/sys_byteorder.h"
 #include "base/system/sys_info.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "jni/MediaDrmBridge_jni.h"
 #include "media/base/android/android_util.h"
 #include "media/base/android/media_codec_util.h"
 #include "media/base/android/media_drm_bridge_client.h"
 #include "media/base/android/media_drm_bridge_delegate.h"
 #include "media/base/android/media_drm_key_type.h"
+#include "media/base/android/media_jni_headers/MediaDrmBridge_jni.h"
 #include "media/base/cdm_key_information.h"
 #include "media/base/media_switches.h"
 #include "media/base/provision_fetcher.h"

diff --git a/media/base/android/media_drm_storage_bridge.cc b/media/base/android/media_drm_storage_bridge.cc
@@ -16,10 +16,10 @@
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/unguessable_token.h"
-#include "jni/MediaDrmStorageBridge_jni.h"
 #include "media/base/android/android_util.h"
 #include "media/base/android/media_drm_bridge.h"
 #include "media/base/android/media_drm_key_type.h"
+#include "media/base/android/media_jni_headers/MediaDrmStorageBridge_jni.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertUTF8ToJavaString;

diff --git a/media/base/android/media_player_bridge.cc b/media/base/android/media_player_bridge.cc
@@ -15,8 +15,8 @@
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_util.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "jni/MediaPlayerBridge_jni.h"
 #include "media/base/android/media_common_android.h"
+#include "media/base/android/media_jni_headers/MediaPlayerBridge_jni.h"
 #include "media/base/android/media_resource_getter.h"
 #include "media/base/android/media_url_interceptor.h"
 #include "media/base/timestamp_constants.h"

diff --git a/media/base/android/media_player_listener.cc b/media/base/android/media_player_listener.cc
@@ -10,7 +10,7 @@
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
-#include "jni/MediaPlayerListener_jni.h"
+#include "media/base/android/media_jni_headers/MediaPlayerListener_jni.h"
 #include "media/base/android/media_player_bridge.h"
 
 using base::android::AttachCurrentThread;

diff --git a/media/base/android/media_server_crash_listener.cc b/media/base/android/media_server_crash_listener.cc
@@ -6,7 +6,7 @@
 
 #include "base/android/jni_android.h"
 #include "base/memory/singleton.h"
-#include "jni/MediaServerCrashListener_jni.h"
+#include "media/base/android/media_jni_headers/MediaServerCrashListener_jni.h"
 
 namespace media {
 

diff --git a/media/capture/content/android/BUILD.gn b/media/capture/content/android/BUILD.gn
@@ -33,7 +33,6 @@ generate_jni("screen_capture_jni_headers") {
   sources = [
     "java/src/org/chromium/media/ScreenCapture.java",
   ]
-  jni_package = "media"
 }
 
 android_library("screen_capture_java") {

diff --git a/media/capture/content/android/screen_capture_machine_android.cc b/media/capture/content/android/screen_capture_machine_android.cc
@@ -8,8 +8,8 @@
 
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.h"
-#include "jni/ScreenCapture_jni.h"
 #include "media/base/video_frame.h"
+#include "media/capture/content/android/screen_capture_jni_headers/ScreenCapture_jni.h"
 #include "media/capture/content/android/thread_safe_capture_oracle.h"
 #include "media/capture/content/video_capture_oracle.h"
 #include "media/capture/video_capture_types.h"

diff --git a/media/capture/video/android/BUILD.gn b/media/capture/video/android/BUILD.gn
@@ -37,7 +37,6 @@ generate_jni("capture_jni_headers") {
     "java/src/org/chromium/media/VideoCapture.java",
     "java/src/org/chromium/media/VideoCaptureFactory.java",
   ]
-  jni_package = "media"
 }
 
 java_cpp_enum("media_java_enums_srcjar") {

diff --git a/media/capture/video/android/photo_capabilities.cc b/media/capture/video/android/photo_capabilities.cc
@@ -7,7 +7,7 @@
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
-#include "jni/PhotoCapabilities_jni.h"
+#include "media/capture/video/android/capture_jni_headers/PhotoCapabilities_jni.h"
 
 using base::android::AttachCurrentThread;
 

diff --git a/media/capture/video/android/video_capture_device_android.cc b/media/capture/video/android/video_capture_device_android.cc
@@ -14,8 +14,8 @@
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "jni/VideoCapture_jni.h"
 #include "media/capture/mojom/image_capture_types.h"
+#include "media/capture/video/android/capture_jni_headers/VideoCapture_jni.h"
 #include "media/capture/video/android/photo_capabilities.h"
 #include "media/capture/video/android/video_capture_device_factory_android.h"
 #include "third_party/libyuv/include/libyuv.h"

diff --git a/media/capture/video/android/video_capture_device_factory_android.cc b/media/capture/video/android/video_capture_device_factory_android.cc
@@ -11,7 +11,7 @@
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
-#include "jni/VideoCaptureFactory_jni.h"
+#include "media/capture/video/android/capture_jni_headers/VideoCaptureFactory_jni.h"
 #include "media/capture/video/android/video_capture_device_android.h"
 
 using base::android::AttachCurrentThread;

diff --git a/media/midi/BUILD.gn b/media/midi/BUILD.gn
@@ -70,7 +70,6 @@ if (is_android) {
       "java/src/org/chromium/midi/UsbMidiDeviceAndroid.java",
       "java/src/org/chromium/midi/UsbMidiDeviceFactoryAndroid.java",
     ]
-    jni_package = "midi"
   }
 }
 

diff --git a/media/midi/midi_device_android.cc b/media/midi/midi_device_android.cc
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/android/jni_string.h"
-#include "jni/MidiDeviceAndroid_jni.h"
+#include "media/midi/midi_jni_headers/MidiDeviceAndroid_jni.h"
 #include "media/midi/midi_output_port_android.h"
 
 using base::android::JavaRef;

diff --git a/media/midi/midi_input_port_android.cc b/media/midi/midi_input_port_android.cc
@@ -6,7 +6,7 @@
 
 #include "base/android/jni_array.h"
 #include "base/time/time.h"
-#include "jni/MidiInputPortAndroid_jni.h"
+#include "media/midi/midi_jni_headers/MidiInputPortAndroid_jni.h"
 
 using base::android::JavaParamRef;
 

diff --git a/media/midi/midi_manager_android.cc b/media/midi/midi_manager_android.cc
@@ -9,8 +9,8 @@
 #include "base/feature_list.h"
 #include "base/metrics/field_trial_params.h"
 #include "base/strings/stringprintf.h"
-#include "jni/MidiManagerAndroid_jni.h"
 #include "media/midi/midi_device_android.h"
+#include "media/midi/midi_jni_headers/MidiManagerAndroid_jni.h"
 #include "media/midi/midi_manager_usb.h"
 #include "media/midi/midi_output_port_android.h"
 #include "media/midi/midi_service.h"

diff --git a/media/midi/midi_output_port_android.cc b/media/midi/midi_output_port_android.cc
@@ -5,7 +5,7 @@
 #include "media/midi/midi_output_port_android.h"
 
 #include "base/android/jni_array.h"
-#include "jni/MidiOutputPortAndroid_jni.h"
+#include "media/midi/midi_jni_headers/MidiOutputPortAndroid_jni.h"
 
 using base::android::ScopedJavaLocalRef;
 

diff --git a/media/midi/usb_midi_device_android.cc b/media/midi/usb_midi_device_android.cc
@@ -10,7 +10,7 @@
 #include "base/i18n/icu_string_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
-#include "jni/UsbMidiDeviceAndroid_jni.h"
+#include "media/midi/midi_jni_headers/UsbMidiDeviceAndroid_jni.h"
 #include "media/midi/usb_midi_descriptor_parser.h"
 
 using base::android::JavaParamRef;

diff --git a/media/midi/usb_midi_device_factory_android.cc b/media/midi/usb_midi_device_factory_android.cc
@@ -9,7 +9,7 @@
 
 #include "base/bind.h"
 #include "base/synchronization/lock.h"
-#include "jni/UsbMidiDeviceFactoryAndroid_jni.h"
+#include "media/midi/midi_jni_headers/UsbMidiDeviceFactoryAndroid_jni.h"
 #include "media/midi/usb_midi_device_android.h"
 
 using base::android::JavaParamRef;
-Original file line number
+Diff line change
@@ Expand Up / @@ -70,7 +70,6 @@ if (is_android) { @@
           "java/src/org/chromium/midi/UsbMidiDeviceAndroid.java",
           "java/src/org/chromium/midi/UsbMidiDeviceFactoryAndroid.java",
         ]
-        jni_package = "midi"
       }
     }
@@ Expand Down @@