diff options
| author | Matthew Waters <matthew@centricular.com> | 2022-06-21 18:19:45 +1000 |
|---|---|---|
| committer | Matthew Waters <matthew@centricular.com> | 2022-06-21 18:22:32 +1000 |
| commit | f8fee72b8b9edb15f960f21e0632a9d130edfe6f (patch) | |
| tree | 1e3b5cf52fdbb44b34d4b2e8ba7f963290a6477e /data | |
| parent | 37125c59dfa2dbea1842b5daa9bb14bcea7b2101 (diff) | |
android: fix build with android gradle plugin 7.2
> [CXX1415] .../gstreamer/subprojects/gst-examples/playback/player/android/app/build/.cxx/Debug/5f6v5o23/arm64-v8a/android_gradle_build.json debug|arm64-v8a : gstreamer_android-debug-gst-build-arm64-v8a.abi 'gst-build-arm64-v8a' is invalid. Valid values are 'armeabi-v7a, arm64-v8a, x86, x86_64'
Move arch-specific directories into their own subdirectory.
It seems like somewhere in gradle is assuming the last path component is
the abi of the built files when that may not actually be the case.
Workaround this.
Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1284
Fixes https://gitlab.freedesktop.org/gstreamer/gst-docs/-/issues/103
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/886>
Diffstat (limited to 'data')
| -rw-r--r-- | data/ndk-build/gstreamer-1.0.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/ndk-build/gstreamer-1.0.mk b/data/ndk-build/gstreamer-1.0.mk index 6565e4aa..6f17042e 100644 --- a/data/ndk-build/gstreamer-1.0.mk +++ b/data/ndk-build/gstreamer-1.0.mk @@ -74,7 +74,7 @@ endif ifndef GSTREAMER_ANDROID_MODULE_NAME GSTREAMER_ANDROID_MODULE_NAME := gstreamer_android endif -GSTREAMER_BUILD_DIR := gst-build-$(TARGET_ARCH_ABI) +GSTREAMER_BUILD_DIR := gst-android-build/$(TARGET_ARCH_ABI) GSTREAMER_ANDROID_O := $(GSTREAMER_BUILD_DIR)/$(GSTREAMER_ANDROID_MODULE_NAME).o GSTREAMER_ANDROID_SO := $(GSTREAMER_BUILD_DIR)/lib$(GSTREAMER_ANDROID_MODULE_NAME).so GSTREAMER_ANDROID_C := $(GSTREAMER_BUILD_DIR)/$(GSTREAMER_ANDROID_MODULE_NAME).c |