diff --git a/android/app/src/main/jni/Android.mk b/android/app/src/main/jni/Android.mk
index 65e2044..593eaae 100644
--- a/android/app/src/main/jni/Android.mk
+++ b/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/
diff --git a/android/app/src/main/jni/Application.mk b/android/app/src/main/jni/Application.mk
index 87c0990..9e74937 100644
--- a/android/app/src/main/jni/Application.mk
+++ b/android/app/src/main/jni/Application.mk
@@ -1 +1,2 @@
 APP_PLATFORM = 15
+APP_ABI = armeabi armeabi-v7a arm64-v8a x86 x86_64
