From: Matthew Waters <matthew@centricular.com>
Date: Mon, 28 Mar 2022 02:28:56 +0000 (+1100)
Subject: examples/player/android: update for android changes
X-Git-Tag: 1.22.0~2027
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5d2d03892d41c12bdc224fb21d6a3c0746601996;p=platform%2Fupstream%2Fgstreamer.git

examples/player/android: update for android changes

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2041>
---

diff --git a/subprojects/gst-examples/playback/player/android/app/build.gradle b/subprojects/gst-examples/playback/player/android/app/build.gradle
index b5fe077..8339984 100644
--- a/subprojects/gst-examples/playback/player/android/app/build.gradle
+++ b/subprojects/gst-examples/playback/player/android/app/build.gradle
@@ -1,17 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 32
 
     defaultConfig {
         applicationId "org.freedesktop.gstreamer.play"
         minSdkVersion 15
-        targetSdkVersion 15
+        targetSdkVersion 32
         versionCode 1
         versionName "1.0"
 
-
         externalNativeBuild {
             ndkBuild {
                 def gstRoot
diff --git a/subprojects/gst-examples/playback/player/android/app/src/main/AndroidManifest.xml b/subprojects/gst-examples/playback/player/android/app/src/main/AndroidManifest.xml
index 39ad252..2f14e53 100644
--- a/subprojects/gst-examples/playback/player/android/app/src/main/AndroidManifest.xml
+++ b/subprojects/gst-examples/playback/player/android/app/src/main/AndroidManifest.xml
@@ -9,7 +9,8 @@
 
     <application android:theme="@style/Theme.AppCompat.Light" android:label="@string/app_name">
         <activity android:name=".Play"
-                  android:label="@string/app_name">
+                  android:label="@string/app_name"
+                  android:exported="true">
             <!-- Files whose MIME type is known to Android -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -333,4 +334,4 @@
 
         </activity>
     </application>
-</manifest> 
+</manifest>
diff --git a/subprojects/gst-examples/playback/player/android/app/src/main/jni/Android.mk b/subprojects/gst-examples/playback/player/android/app/src/main/jni/Android.mk
index f16d62e..8a64f69 100644
--- a/subprojects/gst-examples/playback/player/android/app/src/main/jni/Android.mk
+++ b/subprojects/gst-examples/playback/player/android/app/src/main/jni/Android.mk
@@ -3,7 +3,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE    := gstplayer
-LOCAL_SRC_FILES := player.c
+LOCAL_SRC_FILES := player.c dummy.cpp
 
 LOCAL_SHARED_LIBRARIES := gstreamer_android
 LOCAL_LDLIBS := -llog -landroid
diff --git a/subprojects/gst-examples/playback/player/android/app/src/main/jni/Application.mk b/subprojects/gst-examples/playback/player/android/app/src/main/jni/Application.mk
index 9e74937..ca7d198 100644
--- a/subprojects/gst-examples/playback/player/android/app/src/main/jni/Application.mk
+++ b/subprojects/gst-examples/playback/player/android/app/src/main/jni/Application.mk
@@ -1,2 +1,3 @@
 APP_PLATFORM = 15
 APP_ABI = armeabi armeabi-v7a arm64-v8a x86 x86_64
+APP_STL = c++_shared
diff --git a/subprojects/gst-examples/playback/player/android/build.gradle b/subprojects/gst-examples/playback/player/android/build.gradle
index 9851644..08a9d8e 100644
--- a/subprojects/gst-examples/playback/player/android/build.gradle
+++ b/subprojects/gst-examples/playback/player/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.1'
+        classpath 'com.android.tools.build:gradle:7.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/subprojects/gst-examples/playback/player/android/gradle/wrapper/gradle-wrapper.properties b/subprojects/gst-examples/playback/player/android/gradle/wrapper/gradle-wrapper.properties
index 205e07c..db5e427 100644
--- a/subprojects/gst-examples/playback/player/android/gradle/wrapper/gradle-wrapper.properties
+++ b/subprojects/gst-examples/playback/player/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip