diff --git a/BUILD.gn b/BUILD.gn index 3ad6b08bfa..eaa7ad502e 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -622,10 +622,10 @@ if (rtc_include_tests) { } webrtc_perf_tests_resources = [ + "resources/ConferenceMotion_1280_720_50.yuv", "resources/audio_coding/speech_mono_16kHz.pcm", "resources/audio_coding/speech_mono_32_48kHz.pcm", "resources/audio_coding/testfile32kHz.pcm", - "resources/ConferenceMotion_1280_720_50.yuv", "resources/difficult_photo_1850_1110.yuv", "resources/foreman_cif.yuv", "resources/paris_qcif.yuv", @@ -681,19 +681,19 @@ if (rtc_include_tests) { if (is_android) { junit_binary("android_junit_tests") { - java_files = [ + sources = [ "examples/androidjunit/src/org/appspot/apprtc/BluetoothManagerTest.java", "examples/androidjunit/src/org/appspot/apprtc/DirectRTCClientTest.java", "examples/androidjunit/src/org/appspot/apprtc/TCPChannelClientTest.java", "sdk/android/tests/src/org/webrtc/AndroidVideoDecoderTest.java", "sdk/android/tests/src/org/webrtc/CameraEnumerationTest.java", "sdk/android/tests/src/org/webrtc/CodecTestHelper.java", + "sdk/android/tests/src/org/webrtc/CryptoOptionsTest.java", "sdk/android/tests/src/org/webrtc/FakeMediaCodecWrapper.java", "sdk/android/tests/src/org/webrtc/GlGenericDrawerTest.java", "sdk/android/tests/src/org/webrtc/HardwareVideoEncoderTest.java", "sdk/android/tests/src/org/webrtc/IceCandidateTest.java", "sdk/android/tests/src/org/webrtc/ScalingSettingsTest.java", - "sdk/android/tests/src/org/webrtc/CryptoOptionsTest.java", ] deps = [ diff --git a/examples/BUILD.gn b/examples/BUILD.gn index 6c3c6581f1..2cc356c7f3 100644 --- a/examples/BUILD.gn +++ b/examples/BUILD.gn @@ -107,7 +107,7 @@ if (is_android) { testonly = true android_manifest_for_lint = "androidapp/AndroidManifest.xml" - java_files = [ + sources = [ "androidapp/src/org/appspot/apprtc/AppRTCAudioManager.java", "androidapp/src/org/appspot/apprtc/AppRTCBluetoothManager.java", "androidapp/src/org/appspot/apprtc/AppRTCClient.java", @@ -120,9 +120,9 @@ if (is_android) { "androidapp/src/org/appspot/apprtc/DirectRTCClient.java", "androidapp/src/org/appspot/apprtc/HudFragment.java", "androidapp/src/org/appspot/apprtc/PeerConnectionClient.java", + "androidapp/src/org/appspot/apprtc/RecordedAudioToFileController.java", "androidapp/src/org/appspot/apprtc/RoomParametersFetcher.java", "androidapp/src/org/appspot/apprtc/RtcEventLog.java", - "androidapp/src/org/appspot/apprtc/RecordedAudioToFileController.java", "androidapp/src/org/appspot/apprtc/SettingsActivity.java", "androidapp/src/org/appspot/apprtc/SettingsFragment.java", "androidapp/src/org/appspot/apprtc/TCPChannelClient.java", @@ -168,7 +168,7 @@ if (is_android) { min_sdk_version = 16 target_sdk_version = 21 - java_files = [ + sources = [ "androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java", ] @@ -826,7 +826,9 @@ if (is_win || is_android) { if (is_android) { rtc_android_library("webrtc_unity_java") { - java_files = [ "unityplugin/java/src/org/webrtc/UnityUtility.java" ] + sources = [ + "unityplugin/java/src/org/webrtc/UnityUtility.java", + ] deps = [ "../rtc_base:base_java", "../sdk/android:camera_java", diff --git a/examples/androidnativeapi/BUILD.gn b/examples/androidnativeapi/BUILD.gn index dad08400ff..a5ad414823 100644 --- a/examples/androidnativeapi/BUILD.gn +++ b/examples/androidnativeapi/BUILD.gn @@ -8,9 +8,9 @@ if (is_android) { min_sdk_version = 19 target_sdk_version = 27 - java_files = [ - "java/org/webrtc/examples/androidnativeapi/MainActivity.java", + sources = [ "java/org/webrtc/examples/androidnativeapi/CallClient.java", + "java/org/webrtc/examples/androidnativeapi/MainActivity.java", ] deps = [ diff --git a/modules/audio_device/BUILD.gn b/modules/audio_device/BUILD.gn index e21eecbf27..31bed2d807 100644 --- a/modules/audio_device/BUILD.gn +++ b/modules/audio_device/BUILD.gn @@ -425,7 +425,7 @@ if (rtc_include_tests) { if (!build_with_chromium && is_android) { rtc_android_library("audio_device_java") { - java_files = [ + sources = [ "android/java/src/org/webrtc/voiceengine/BuildInfo.java", "android/java/src/org/webrtc/voiceengine/WebRtcAudioEffects.java", "android/java/src/org/webrtc/voiceengine/WebRtcAudioManager.java", diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn index 9ff86ddb39..9c4cfa9269 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -1410,7 +1410,7 @@ if (rtc_include_tests) { if (is_android) { rtc_android_library("base_java") { visibility = [ "*" ] - java_files = [ + sources = [ "java/src/org/webrtc/ContextUtils.java", "java/src/org/webrtc/Loggable.java", "java/src/org/webrtc/Logging.java", diff --git a/rtc_tools/network_tester/BUILD.gn b/rtc_tools/network_tester/BUILD.gn index 36fa18542c..f8623bd2b6 100644 --- a/rtc_tools/network_tester/BUILD.gn +++ b/rtc_tools/network_tester/BUILD.gn @@ -129,7 +129,7 @@ if (is_android) { testonly = true android_manifest_for_lint = "androidapp/AndroidManifest.xml" - java_files = [ + sources = [ "androidapp/src/com/google/media/networktester/MainActivity.java", "androidapp/src/com/google/media/networktester/NetworkTester.java", ] diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn index bfc7166933..89fb602937 100644 --- a/sdk/android/BUILD.gn +++ b/sdk/android/BUILD.gn @@ -75,7 +75,9 @@ if (is_android) { # Old target that pulls in everything. This will be going away in the future, # clients should depend on individual video_java etc. targets instead. rtc_android_library("libjingle_peerconnection_java") { - java_files = [ "src/java/org/webrtc/Empty.java" ] + sources = [ + "src/java/org/webrtc/Empty.java", + ] deps = [ ":audio_api_java", @@ -95,7 +97,9 @@ if (is_android) { } rtc_android_library("libjingle_peerconnection_metrics_default_java") { - java_files = [ "api/org/webrtc/Metrics.java" ] + sources = [ + "api/org/webrtc/Metrics.java", + ] deps = [ ":base_java", @@ -163,9 +167,9 @@ if (is_android) { # TODO(sakal): Extract files from this target to releveant subtargets, video, audio etc. rtc_android_library("base_java") { - java_files = [ - "api/org/webrtc/RefCounted.java", + sources = [ "api/org/webrtc/Predicate.java", + "api/org/webrtc/RefCounted.java", "src/java/org/webrtc/CalledByNative.java", "src/java/org/webrtc/CalledByNativeUnchecked.java", "src/java/org/webrtc/Histogram.java", @@ -183,10 +187,10 @@ if (is_android) { rtc_android_library("audio_api_java") { visibility = [ "*" ] - java_files = [ - "api/org/webrtc/audio/AudioDeviceModule.java", + sources = [ "api/org/webrtc/AudioDecoderFactoryFactory.java", "api/org/webrtc/AudioEncoderFactoryFactory.java", + "api/org/webrtc/audio/AudioDeviceModule.java", ] deps = [ @@ -197,10 +201,10 @@ if (is_android) { rtc_android_library("video_api_java") { visibility = [ "*" ] - java_files = [ + sources = [ + "api/org/webrtc/CapturerObserver.java", "api/org/webrtc/EncodedImage.java", "api/org/webrtc/VideoCodecInfo.java", - "api/org/webrtc/CapturerObserver.java", "api/org/webrtc/VideoCodecStatus.java", "api/org/webrtc/VideoDecoder.java", "api/org/webrtc/VideoDecoderFactory.java", @@ -219,7 +223,7 @@ if (is_android) { rtc_android_library("video_java") { visibility = [ "*" ] - java_files = [ + sources = [ "api/org/webrtc/EglBase.java", "api/org/webrtc/EglBase10.java", "api/org/webrtc/EglBase14.java", @@ -232,15 +236,15 @@ if (is_android) { "api/org/webrtc/RendererCommon.java", "api/org/webrtc/SurfaceTextureHelper.java", "api/org/webrtc/TextureBufferImpl.java", + "api/org/webrtc/TimestampAligner.java", "api/org/webrtc/VideoCapturer.java", "api/org/webrtc/VideoDecoderFallback.java", "api/org/webrtc/VideoEncoderFallback.java", "api/org/webrtc/VideoFrameDrawer.java", - "api/org/webrtc/YuvConverter.java", - "api/org/webrtc/YuvHelper.java", - "api/org/webrtc/TimestampAligner.java", "api/org/webrtc/WrappedNativeVideoDecoder.java", "api/org/webrtc/WrappedNativeVideoEncoder.java", + "api/org/webrtc/YuvConverter.java", + "api/org/webrtc/YuvHelper.java", "src/java/org/webrtc/EglBase10Impl.java", "src/java/org/webrtc/EglBase14Impl.java", "src/java/org/webrtc/GlGenericDrawer.java", @@ -261,7 +265,7 @@ if (is_android) { rtc_android_library("peerconnection_java") { visibility = [ "*" ] - java_files = [ + sources = [ "api/org/webrtc/AudioProcessingFactory.java", "api/org/webrtc/AudioSource.java", "api/org/webrtc/AudioTrack.java", @@ -271,9 +275,6 @@ if (is_android) { "api/org/webrtc/DataChannel.java", "api/org/webrtc/DtmfSender.java", "api/org/webrtc/FecControllerFactoryFactoryInterface.java", - "api/org/webrtc/NetworkControllerFactoryFactory.java", - "api/org/webrtc/NetworkStatePredictorFactoryFactory.java", - "api/org/webrtc/MediaTransportFactoryFactory.java", "api/org/webrtc/FrameDecryptor.java", "api/org/webrtc/FrameEncryptor.java", "api/org/webrtc/IceCandidate.java", @@ -283,18 +284,21 @@ if (is_android) { "api/org/webrtc/MediaSource.java", "api/org/webrtc/MediaStream.java", "api/org/webrtc/MediaStreamTrack.java", + "api/org/webrtc/MediaTransportFactoryFactory.java", "api/org/webrtc/NativeLibraryLoader.java", "api/org/webrtc/NativePeerConnectionFactory.java", "api/org/webrtc/NetEqFactoryFactory.java", + "api/org/webrtc/NetworkControllerFactoryFactory.java", "api/org/webrtc/NetworkMonitor.java", # TODO(sakal): Break dependencies and move to base_java. "api/org/webrtc/NetworkMonitorAutoDetect.java", # TODO(sakal): Break dependencies and move to base_java. + "api/org/webrtc/NetworkStatePredictorFactoryFactory.java", "api/org/webrtc/PeerConnection.java", "api/org/webrtc/PeerConnectionDependencies.java", "api/org/webrtc/PeerConnectionFactory.java", - "api/org/webrtc/RtcCertificatePem.java", "api/org/webrtc/RTCStats.java", "api/org/webrtc/RTCStatsCollectorCallback.java", "api/org/webrtc/RTCStatsReport.java", + "api/org/webrtc/RtcCertificatePem.java", "api/org/webrtc/RtpParameters.java", "api/org/webrtc/RtpReceiver.java", "api/org/webrtc/RtpSender.java", @@ -305,12 +309,12 @@ if (is_android) { "api/org/webrtc/StatsObserver.java", "api/org/webrtc/StatsReport.java", "api/org/webrtc/TurnCustomizer.java", - "api/org/webrtc/VideoSource.java", "api/org/webrtc/VideoProcessor.java", + "api/org/webrtc/VideoSource.java", "api/org/webrtc/VideoTrack.java", - "src/java/org/webrtc/NativeLibrary.java", - "src/java/org/webrtc/NativeCapturerObserver.java", "src/java/org/webrtc/NativeAndroidVideoTrackSource.java", + "src/java/org/webrtc/NativeCapturerObserver.java", + "src/java/org/webrtc/NativeLibrary.java", ] deps = [ @@ -335,7 +339,7 @@ if (is_android) { rtc_android_library("camera_java") { visibility = [ "*" ] - java_files = [ + sources = [ "api/org/webrtc/Camera1Capturer.java", "api/org/webrtc/Camera1Enumerator.java", "api/org/webrtc/Camera2Capturer.java", @@ -360,7 +364,7 @@ if (is_android) { rtc_android_library("default_video_codec_factory_java") { visibility = [ "*" ] - java_files = [ + sources = [ "api/org/webrtc/DefaultVideoDecoderFactory.java", "api/org/webrtc/DefaultVideoEncoderFactory.java", ] @@ -376,9 +380,9 @@ if (is_android) { rtc_android_library("filevideo_java") { visibility = [ "*" ] - java_files = [ - "api/org/webrtc/VideoFileRenderer.java", + sources = [ "api/org/webrtc/FileVideoCapturer.java", + "api/org/webrtc/VideoFileRenderer.java", ] deps = [ @@ -391,7 +395,7 @@ if (is_android) { rtc_android_library("hwcodecs_java") { visibility = [ "*" ] - java_files = [ + sources = [ "api/org/webrtc/HardwareVideoDecoderFactory.java", "api/org/webrtc/HardwareVideoEncoderFactory.java", "api/org/webrtc/PlatformSoftwareVideoDecoderFactory.java", @@ -421,7 +425,7 @@ if (is_android) { rtc_android_library("java_audio_device_module_java") { visibility = [ "*" ] - java_files = [ + sources = [ "api/org/webrtc/audio/JavaAudioDeviceModule.java", "src/java/org/webrtc/audio/VolumeLogger.java", "src/java/org/webrtc/audio/WebRtcAudioEffects.java", @@ -441,7 +445,7 @@ if (is_android) { rtc_android_library("builtin_audio_codecs_java") { visibility = [ "*" ] - java_files = [ + sources = [ "api/org/webrtc/BuiltinAudioDecoderFactoryFactory.java", "api/org/webrtc/BuiltinAudioEncoderFactoryFactory.java", ] @@ -453,7 +457,9 @@ if (is_android) { rtc_android_library("screencapturer_java") { visibility = [ "*" ] - java_files = [ "api/org/webrtc/ScreenCapturerAndroid.java" ] + sources = [ + "api/org/webrtc/ScreenCapturerAndroid.java", + ] deps = [ ":video_api_java", @@ -465,7 +471,7 @@ if (is_android) { rtc_android_library("surfaceviewrenderer_java") { visibility = [ "*" ] - java_files = [ + sources = [ "api/org/webrtc/SurfaceEglRenderer.java", "api/org/webrtc/SurfaceViewRenderer.java", ] @@ -479,7 +485,7 @@ if (is_android) { rtc_android_library("libvpx_vp8_java") { visibility = [ "*" ] - java_files = [ + sources = [ "api/org/webrtc/LibvpxVp8Decoder.java", "api/org/webrtc/LibvpxVp8Encoder.java", ] @@ -493,7 +499,7 @@ if (is_android) { rtc_android_library("libvpx_vp9_java") { visibility = [ "*" ] - java_files = [ + sources = [ "api/org/webrtc/LibvpxVp9Decoder.java", "api/org/webrtc/LibvpxVp9Encoder.java", ] @@ -507,7 +513,7 @@ if (is_android) { rtc_android_library("swcodecs_java") { visibility = [ "*" ] - java_files = [ + sources = [ "api/org/webrtc/SoftwareVideoDecoderFactory.java", "api/org/webrtc/SoftwareVideoEncoderFactory.java", ] @@ -1010,7 +1016,9 @@ if (current_os == "linux" || is_android) { #################### rtc_android_library("logging_java") { - java_files = [ "src/java/org/webrtc/JNILogging.java" ] + sources = [ + "src/java/org/webrtc/JNILogging.java", + ] deps = [ ":base_java", @@ -1365,7 +1373,7 @@ if (is_android) { min_sdk_version = 16 target_sdk_version = 21 - java_files = [ + sources = [ "instrumentationtests/src/org/webrtc/AndroidVideoDecoderInstrumentationTest.java", "instrumentationtests/src/org/webrtc/BuiltinAudioCodecsFactoryFactoryTest.java", "instrumentationtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java", @@ -1520,7 +1528,7 @@ if (is_android) { rtc_android_library("native_unittests_java") { testonly = true - java_files = [ + sources = [ "native_unittests/org/webrtc/ApplicationContextProvider.java", "native_unittests/org/webrtc/BuildInfo.java", "native_unittests/org/webrtc/CodecsWrapperTestHelper.java", diff --git a/test/BUILD.gn b/test/BUILD.gn index 2316e0f353..1176b6e417 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -1003,7 +1003,7 @@ rtc_library("copy_to_file_audio_capturer_unittest") { if (!build_with_chromium && is_android) { rtc_android_library("native_test_java") { testonly = true - java_files = [ + sources = [ "android/org/webrtc/native_test/RTCNativeUnitTest.java", "android/org/webrtc/native_test/RTCNativeUnitTestActivity.java", ]