Universal build + update to Nougat

android/app/build.gradle

@@ -7,7 +7,7 @@ def getNdkCommandLine(ndkRoot, target) {
     if (project.hasProperty('gstAndroidRoot'))
         gstRoot = project.gstAndroidRoot
     else
-        gstRoot = System.properties['user.home'] + '/cerbero/dist/android_arm'
+        throw new GradleException('"gstAndroidRoot" must be defined in your gradle properties to the top level directory of the unpacked universal GStreamer SDK')
 
     if (ndkRoot == null)
         throw new GradleException('NDK not configured')
@@ -22,7 +22,7 @@ def getNdkCommandLine(ndkRoot, target) {
 }
 
 android {
-    compileSdkVersion 23
+    compileSdkVersion 24
     buildToolsVersion "23.0.3"
 
     sourceSets {
@@ -36,7 +36,7 @@ android {
     defaultConfig {
         applicationId "org.freedesktop.gstreamer.play"
         minSdkVersion 15
-        targetSdkVersion 15
+        targetSdkVersion 24
         versionCode 1
         versionName "1.0"
     }
@@ -69,5 +69,5 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.1.1'
+    compile 'com.android.support:appcompat-v7:24.2.0'
 }

android/app/src/main/jni/Android.mk

@@ -9,25 +9,22 @@ LOCAL_SHARED_LIBRARIES := gstreamer_android
 LOCAL_LDLIBS := -llog -landroid
 include $(BUILD_SHARED_LIBRARY)
 
+ifndef GSTREAMER_ROOT_ANDROID
+$(error GSTREAMER_ROOT_ANDROID is not defined!)
+endif
+
 ifeq ($(TARGET_ARCH_ABI),armeabi)
-GSTREAMER_ROOT        := $(GSTREAMER_ROOT_ARM)
+GSTREAMER_ROOT        := $(GSTREAMER_ROOT_ANDROID)/arm
 else ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-GSTREAMER_ROOT        := $(GSTREAMER_ROOT_ARMV7)
+GSTREAMER_ROOT        := $(GSTREAMER_ROOT_ANDROID)/armv7
 else ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
-GSTREAMER_ROOT        := $(GSTREAMER_ROOT_ARM64)
+GSTREAMER_ROOT        := $(GSTREAMER_ROOT_ANDROID)/arm64
 else ifeq ($(TARGET_ARCH_ABI),x86)
-GSTREAMER_ROOT        := $(GSTREAMER_ROOT_X86)
+GSTREAMER_ROOT        := $(GSTREAMER_ROOT_ANDROID)/x86
 else ifeq ($(TARGET_ARCH_ABI),x86_64)
-GSTREAMER_ROOT        := $(GSTREAMER_ROOT_X86_64)
+GSTREAMER_ROOT        := $(GSTREAMER_ROOT_ANDROID)/x86_64
 else
-$(error Target arch ABI not supported)
-endif
-
-ifndef GSTREAMER_ROOT
-ifndef GSTREAMER_ROOT_ANDROID
-$(error GSTREAMER_ROOT_ANDROID is not defined!)
-endif
-GSTREAMER_ROOT        := $(GSTREAMER_ROOT_ANDROID)
+$(error Target arch ABI not supported: $(TARGET_ARCH_ABI))
 endif
 
 GSTREAMER_NDK_BUILD_PATH  := $(GSTREAMER_ROOT)/share/gst-android/ndk-build/

android/app/src/main/jni/Application.mk

@@ -1 +1,2 @@
 APP_PLATFORM = 15
+APP_ABI = armeabi armeabi-v7a arm64-v8a x86 x86_64