From 8ab2844443b40b4732ed9ba50a265d57ec12eeae Mon Sep 17 00:00:00 2001 From: "L. E. Segovia" Date: Wed, 12 Feb 2025 21:55:31 -0300 Subject: [PATCH] android: Use the Ninja generator An upcoming Cerbero change will one-ring all the builds. Part-of: --- .../examples/tutorials/android/android-tutorial-1/build.gradle | 2 +- .../examples/tutorials/android/android-tutorial-2/build.gradle | 2 +- .../examples/tutorials/android/android-tutorial-3/build.gradle | 2 +- .../examples/tutorials/android/android-tutorial-4/build.gradle | 2 +- .../examples/tutorials/android/android-tutorial-5/build.gradle | 2 +- .../gst-examples/playback/player/android/app/build.gradle | 2 +- subprojects/gst-examples/vulkan/android/build.gradle | 2 +- subprojects/gst-examples/webrtc/android/app/build.gradle | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/subprojects/gst-docs/examples/tutorials/android/android-tutorial-1/build.gradle b/subprojects/gst-docs/examples/tutorials/android/android-tutorial-1/build.gradle index 78434cc7da..552460da15 100644 --- a/subprojects/gst-docs/examples/tutorials/android/android-tutorial-1/build.gradle +++ b/subprojects/gst-docs/examples/tutorials/android/android-tutorial-1/build.gradle @@ -23,7 +23,7 @@ android { if (gstRoot == null) throw new GradleException('GSTREAMER_ROOT_ANDROID must be set, or "gstAndroidRoot" must be defined in your gradle.properties in the top level directory of the unpacked universal GStreamer Android binaries') - arguments "-DCMAKE_BUILD_TYPE=Release", "-DANDROID_STL=c++_shared", "-DGSTREAMER_ROOT_ANDROID=$gstRoot" + arguments "-DANDROID_STL=c++_shared", "-DGSTREAMER_ROOT_ANDROID=$gstRoot", "-GNinja" targets "tutorial-1" diff --git a/subprojects/gst-docs/examples/tutorials/android/android-tutorial-2/build.gradle b/subprojects/gst-docs/examples/tutorials/android/android-tutorial-2/build.gradle index d30a6d4d2e..8a2cef8758 100644 --- a/subprojects/gst-docs/examples/tutorials/android/android-tutorial-2/build.gradle +++ b/subprojects/gst-docs/examples/tutorials/android/android-tutorial-2/build.gradle @@ -23,7 +23,7 @@ android { if (gstRoot == null) throw new GradleException('GSTREAMER_ROOT_ANDROID must be set, or "gstAndroidRoot" must be defined in your gradle.properties in the top level directory of the unpacked universal GStreamer Android binaries') - arguments "-DCMAKE_BUILD_TYPE=Release", "-DANDROID_STL=c++_shared", "-DGSTREAMER_ROOT_ANDROID=$gstRoot" + arguments "-DANDROID_STL=c++_shared", "-DGSTREAMER_ROOT_ANDROID=$gstRoot", "-GNinja" targets "tutorial-2" diff --git a/subprojects/gst-docs/examples/tutorials/android/android-tutorial-3/build.gradle b/subprojects/gst-docs/examples/tutorials/android/android-tutorial-3/build.gradle index 8b0c6dd6c3..9eda16f1ec 100644 --- a/subprojects/gst-docs/examples/tutorials/android/android-tutorial-3/build.gradle +++ b/subprojects/gst-docs/examples/tutorials/android/android-tutorial-3/build.gradle @@ -23,7 +23,7 @@ android { if (gstRoot == null) throw new GradleException('GSTREAMER_ROOT_ANDROID must be set, or "gstAndroidRoot" must be defined in your gradle.properties in the top level directory of the unpacked universal GStreamer Android binaries') - arguments "-DCMAKE_BUILD_TYPE=Release", "-DANDROID_STL=c++_shared", "-DGSTREAMER_ROOT_ANDROID=$gstRoot" + arguments "-DANDROID_STL=c++_shared", "-DGSTREAMER_ROOT_ANDROID=$gstRoot", "-GNinja" targets "tutorial-3" diff --git a/subprojects/gst-docs/examples/tutorials/android/android-tutorial-4/build.gradle b/subprojects/gst-docs/examples/tutorials/android/android-tutorial-4/build.gradle index d37fb17879..39446bd540 100644 --- a/subprojects/gst-docs/examples/tutorials/android/android-tutorial-4/build.gradle +++ b/subprojects/gst-docs/examples/tutorials/android/android-tutorial-4/build.gradle @@ -23,7 +23,7 @@ android { if (gstRoot == null) throw new GradleException('GSTREAMER_ROOT_ANDROID must be set, or "gstAndroidRoot" must be defined in your gradle.properties in the top level directory of the unpacked universal GStreamer Android binaries') - arguments "-DCMAKE_BUILD_TYPE=Release", "-DANDROID_STL=c++_shared", "-DGSTREAMER_ROOT_ANDROID=$gstRoot" + arguments "-DANDROID_STL=c++_shared", "-DGSTREAMER_ROOT_ANDROID=$gstRoot", "-GNinja" targets "tutorial-4" diff --git a/subprojects/gst-docs/examples/tutorials/android/android-tutorial-5/build.gradle b/subprojects/gst-docs/examples/tutorials/android/android-tutorial-5/build.gradle index 01ed08d83a..8eb09197e6 100644 --- a/subprojects/gst-docs/examples/tutorials/android/android-tutorial-5/build.gradle +++ b/subprojects/gst-docs/examples/tutorials/android/android-tutorial-5/build.gradle @@ -23,7 +23,7 @@ android { if (gstRoot == null) throw new GradleException('GSTREAMER_ROOT_ANDROID must be set, or "gstAndroidRoot" must be defined in your gradle.properties in the top level directory of the unpacked universal GStreamer Android binaries') - arguments "-DCMAKE_BUILD_TYPE=Release", "-DANDROID_STL=c++_shared", "-DGSTREAMER_ROOT_ANDROID=$gstRoot" + arguments "-DANDROID_STL=c++_shared", "-DGSTREAMER_ROOT_ANDROID=$gstRoot", "-GNinja" targets "tutorial-5" diff --git a/subprojects/gst-examples/playback/player/android/app/build.gradle b/subprojects/gst-examples/playback/player/android/app/build.gradle index 628b395c6d..86a4fcda7a 100644 --- a/subprojects/gst-examples/playback/player/android/app/build.gradle +++ b/subprojects/gst-examples/playback/player/android/app/build.gradle @@ -22,7 +22,7 @@ android { if (gstRoot == null) throw new GradleException('GSTREAMER_ROOT_ANDROID must be set, or "gstAndroidRoot" must be defined in your gradle.properties in the top level directory of the unpacked universal GStreamer Android binaries') - arguments "-DCMAKE_BUILD_TYPE=Release", "-DANDROID_STL=c++_shared", "-DGStreamer_JAVA_SRC_DIR=java", "-DGSTREAMER_ROOT_ANDROID=$gstRoot", "-DGStreamer_ASSETS_DIR=assets" + arguments "-DANDROID_STL=c++_shared", "-DGStreamer_JAVA_SRC_DIR=java", "-DGSTREAMER_ROOT_ANDROID=$gstRoot", "-DGStreamer_ASSETS_DIR=assets", "-GNinja" targets "gstplayer" diff --git a/subprojects/gst-examples/vulkan/android/build.gradle b/subprojects/gst-examples/vulkan/android/build.gradle index b7522371ea..07c6add173 100644 --- a/subprojects/gst-examples/vulkan/android/build.gradle +++ b/subprojects/gst-examples/vulkan/android/build.gradle @@ -23,7 +23,7 @@ android { if (gstRoot == null) throw new GradleException('GSTREAMER_ROOT_ANDROID must be set, or "gstAndroidRoot" must be defined in your gradle.properties in the top level directory of the unpacked universal GStreamer Android binaries') - arguments "-DCMAKE_BUILD_TYPE=Release", "-DANDROID_STL=c++_shared", "-DGSTREAMER_ROOT_ANDROID=$gstRoot" + arguments "-DANDROID_STL=c++_shared", "-DGSTREAMER_ROOT_ANDROID=$gstRoot", "-GNinja" targets "vulkan-1" diff --git a/subprojects/gst-examples/webrtc/android/app/build.gradle b/subprojects/gst-examples/webrtc/android/app/build.gradle index b8894db2a5..b9a661dd7e 100644 --- a/subprojects/gst-examples/webrtc/android/app/build.gradle +++ b/subprojects/gst-examples/webrtc/android/app/build.gradle @@ -23,7 +23,7 @@ android { if (gstRoot == null) throw new GradleException('GSTREAMER_ROOT_ANDROID must be set, or "gstAndroidRoot" must be defined in your gradle.properties in the top level directory of the unpacked universal GStreamer Android binaries') - arguments "-DCMAKE_BUILD_TYPE=Release", "-DANDROID_STL=c++_shared", "-DGStreamer_JAVA_SRC_DIR=java", "-DGSTREAMER_ROOT_ANDROID=$gstRoot", "-DGStreamer_ASSETS_DIR=assets" + arguments "-DANDROID_STL=c++_shared", "-DGStreamer_JAVA_SRC_DIR=java", "-DGSTREAMER_ROOT_ANDROID=$gstRoot", "-DGStreamer_ASSETS_DIR=assets", "-GNinja" targets "gstwebrtc"