From 195b94a0713045a6f3fd4be7cede50e6f3bf67a4 Mon Sep 17 00:00:00 2001 From: quackdoc Date: Thu, 7 Apr 2022 22:23:08 -0400 Subject: [PATCH 1/8] initial split changes --- .github/workflows/main.yml | 3 +++ app/src/main/jni/Android.mk | 4 +++- app/src/main/jni/Application.mk | 2 ++ buildscripts/buildall.sh | 7 +++++++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2d0dd07cb..442be88cc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -43,6 +43,7 @@ jobs: - name: download-deps working-directory: ./buildscripts run: | + export mpvarchoverride=arm7l chmod +x github-prepare.sh ./github-prepare.sh - name: build-apk @@ -101,6 +102,7 @@ jobs: - name: download-deps working-directory: ./buildscripts run: | + export mpvarchoverride=x86_64 chmod +x github-prepare.sh ./github-prepare.sh x86_64 - name: build-apk @@ -157,6 +159,7 @@ jobs: - name: download-deps working-directory: ./buildscripts run: | + export mpvarchoverride=arm64 chmod +x github-prepare.sh ./github-prepare.sh arm64 - name: build-apk diff --git a/app/src/main/jni/Android.mk b/app/src/main/jni/Android.mk index 102dd35e0..f71dd65ba 100644 --- a/app/src/main/jni/Android.mk +++ b/app/src/main/jni/Android.mk @@ -1,5 +1,7 @@ LOCAL_PATH:= $(call my-dir) - +ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) +PREFIX = $(PREFIX32) +endif ifeq ($(TARGET_ARCH_ABI),arm64-v8a) PREFIX = $(PREFIX64) endif diff --git a/app/src/main/jni/Application.mk b/app/src/main/jni/Application.mk index fa5b0e51b..fcfa92c9d 100644 --- a/app/src/main/jni/Application.mk +++ b/app/src/main/jni/Application.mk @@ -1,4 +1,6 @@ +ifneq ($(PREFIX32),) APP_ABI := armeabi-v7a +endif ifneq ($(PREFIX64),) APP_ABI += arm64-v8a endif diff --git a/buildscripts/buildall.sh b/buildscripts/buildall.sh index 8f34cde3f..97e9e892b 100755 --- a/buildscripts/buildall.sh +++ b/buildscripts/buildall.sh @@ -7,7 +7,13 @@ cleanbuild=0 nodeps=0 clang=1 target=mpv-android + +if [ -z $mpvarchoverride ] +then arch=armv7l +else +arch=$mpvarchoverride +fi getdeps () { varname="dep_${1//-/_}[*]" @@ -118,6 +124,7 @@ usage () { echo "--clean Clean build dirs before compiling" echo "--gcc Use gcc compiler (unsupported!)" echo "--arch Build for specified architecture (default: $arch; supported: armv7l, arm64, x86_64)" + echo "--no32 Build only for specified architecture (supported: armv7l, arm64, x86_64)" exit 0 } From 70985c3abc5d30900c780e09d55fc97779755652 Mon Sep 17 00:00:00 2001 From: quackdoc Date: Thu, 7 Apr 2022 22:33:55 -0400 Subject: [PATCH 2/8] remove uneeded command with typo --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 442be88cc..a32737c61 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -43,7 +43,6 @@ jobs: - name: download-deps working-directory: ./buildscripts run: | - export mpvarchoverride=arm7l chmod +x github-prepare.sh ./github-prepare.sh - name: build-apk From 54375dc00597d06a96293db00c68510412ef9ae8 Mon Sep 17 00:00:00 2001 From: quackdoc Date: Thu, 7 Apr 2022 22:45:37 -0400 Subject: [PATCH 3/8] re-implement? --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a32737c61..d701eb7ad 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -43,6 +43,7 @@ jobs: - name: download-deps working-directory: ./buildscripts run: | + export mpvarchoverride=armv7l chmod +x github-prepare.sh ./github-prepare.sh - name: build-apk From 3ca6ad58b2eca4ae17341bf2179af11692d8f8e8 Mon Sep 17 00:00:00 2001 From: quackdoc Date: Thu, 7 Apr 2022 23:54:52 -0400 Subject: [PATCH 4/8] add native prefix --- buildscripts/scripts/mpv-android.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/buildscripts/scripts/mpv-android.sh b/buildscripts/scripts/mpv-android.sh index e7f849d79..3fd3d1d5b 100755 --- a/buildscripts/scripts/mpv-android.sh +++ b/buildscripts/scripts/mpv-android.sh @@ -24,6 +24,7 @@ nativeprefix () { fi } +prefix32=$(nativeprefix "armv7l") prefix64=$(nativeprefix "arm64") prefix_x64=$(nativeprefix "x86_64") prefix_x86=$(nativeprefix "x86") From ef2f5e0b4eb837f4b58eed32b63ddb3d1b5019f0 Mon Sep 17 00:00:00 2001 From: quackdoc Date: Fri, 8 Apr 2022 00:08:19 -0400 Subject: [PATCH 5/8] fix oopsie --- app/src/main/jni/Android.mk | 2 +- app/src/main/jni/Application.mk | 2 +- buildscripts/scripts/mpv-android.sh | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/src/main/jni/Android.mk b/app/src/main/jni/Android.mk index f71dd65ba..00ea0ef63 100644 --- a/app/src/main/jni/Android.mk +++ b/app/src/main/jni/Android.mk @@ -1,6 +1,6 @@ LOCAL_PATH:= $(call my-dir) ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) -PREFIX = $(PREFIX32) +PREFIX = $(PREFIX) endif ifeq ($(TARGET_ARCH_ABI),arm64-v8a) PREFIX = $(PREFIX64) diff --git a/app/src/main/jni/Application.mk b/app/src/main/jni/Application.mk index fcfa92c9d..d13e65658 100644 --- a/app/src/main/jni/Application.mk +++ b/app/src/main/jni/Application.mk @@ -1,4 +1,4 @@ -ifneq ($(PREFIX32),) +ifneq ($(PREFIX),) APP_ABI := armeabi-v7a endif ifneq ($(PREFIX64),) diff --git a/buildscripts/scripts/mpv-android.sh b/buildscripts/scripts/mpv-android.sh index 3fd3d1d5b..e7f849d79 100755 --- a/buildscripts/scripts/mpv-android.sh +++ b/buildscripts/scripts/mpv-android.sh @@ -24,7 +24,6 @@ nativeprefix () { fi } -prefix32=$(nativeprefix "armv7l") prefix64=$(nativeprefix "arm64") prefix_x64=$(nativeprefix "x86_64") prefix_x86=$(nativeprefix "x86") From e2a3d83b81081b8a9c5d530b113e8b8679f2a10a Mon Sep 17 00:00:00 2001 From: quackdoc Date: Fri, 8 Apr 2022 00:19:36 -0400 Subject: [PATCH 6/8] cheap hack --- app/src/main/jni/Android.mk | 2 +- app/src/main/jni/Application.mk | 2 +- buildscripts/scripts/mpv-android.sh | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/jni/Android.mk b/app/src/main/jni/Android.mk index 00ea0ef63..f71dd65ba 100644 --- a/app/src/main/jni/Android.mk +++ b/app/src/main/jni/Android.mk @@ -1,6 +1,6 @@ LOCAL_PATH:= $(call my-dir) ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) -PREFIX = $(PREFIX) +PREFIX = $(PREFIX32) endif ifeq ($(TARGET_ARCH_ABI),arm64-v8a) PREFIX = $(PREFIX64) diff --git a/app/src/main/jni/Application.mk b/app/src/main/jni/Application.mk index d13e65658..fcfa92c9d 100644 --- a/app/src/main/jni/Application.mk +++ b/app/src/main/jni/Application.mk @@ -1,4 +1,4 @@ -ifneq ($(PREFIX),) +ifneq ($(PREFIX32),) APP_ABI := armeabi-v7a endif ifneq ($(PREFIX64),) diff --git a/buildscripts/scripts/mpv-android.sh b/buildscripts/scripts/mpv-android.sh index e7f849d79..a2ae4c3fb 100755 --- a/buildscripts/scripts/mpv-android.sh +++ b/buildscripts/scripts/mpv-android.sh @@ -24,11 +24,12 @@ nativeprefix () { fi } +prefix32=$(nativeprefix "armv7l") prefix64=$(nativeprefix "arm64") prefix_x64=$(nativeprefix "x86_64") prefix_x86=$(nativeprefix "x86") -PREFIX=$BUILD/prefix/armv7l PREFIX64=$prefix64 PREFIX_X64=$prefix_x64 PREFIX_X86=$prefix_x86 \ +PREFIX=$BUILD/prefix/armv7l PREFIX64=$prefix64 PREFIX32=$prefix32 PREFIX_X64=$prefix_x64 PREFIX_X86=$prefix_x86 \ ndk-build -C app/src/main -j$cores ./gradlew assembleDebug assembleRelease From 73a70431bfa3ce7aea0b53caf4990a89782de43c Mon Sep 17 00:00:00 2001 From: quackdoc Date: Fri, 8 Apr 2022 00:21:56 -0400 Subject: [PATCH 7/8] fix --- app/src/main/jni/Android.mk | 3 --- buildscripts/scripts/mpv-android.sh | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/app/src/main/jni/Android.mk b/app/src/main/jni/Android.mk index f71dd65ba..8c0a30a4d 100644 --- a/app/src/main/jni/Android.mk +++ b/app/src/main/jni/Android.mk @@ -1,7 +1,4 @@ LOCAL_PATH:= $(call my-dir) -ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) -PREFIX = $(PREFIX32) -endif ifeq ($(TARGET_ARCH_ABI),arm64-v8a) PREFIX = $(PREFIX64) endif diff --git a/buildscripts/scripts/mpv-android.sh b/buildscripts/scripts/mpv-android.sh index a2ae4c3fb..e7f849d79 100755 --- a/buildscripts/scripts/mpv-android.sh +++ b/buildscripts/scripts/mpv-android.sh @@ -24,12 +24,11 @@ nativeprefix () { fi } -prefix32=$(nativeprefix "armv7l") prefix64=$(nativeprefix "arm64") prefix_x64=$(nativeprefix "x86_64") prefix_x86=$(nativeprefix "x86") -PREFIX=$BUILD/prefix/armv7l PREFIX64=$prefix64 PREFIX32=$prefix32 PREFIX_X64=$prefix_x64 PREFIX_X86=$prefix_x86 \ +PREFIX=$BUILD/prefix/armv7l PREFIX64=$prefix64 PREFIX_X64=$prefix_x64 PREFIX_X86=$prefix_x86 \ ndk-build -C app/src/main -j$cores ./gradlew assembleDebug assembleRelease From 07a0800918fde6acc4d37c06e144abddb3e33947 Mon Sep 17 00:00:00 2001 From: quackdoc Date: Fri, 8 Apr 2022 00:31:31 -0400 Subject: [PATCH 8/8] Revert "fix" This reverts commit 73a70431bfa3ce7aea0b53caf4990a89782de43c. --- app/src/main/jni/Android.mk | 3 +++ buildscripts/scripts/mpv-android.sh | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/jni/Android.mk b/app/src/main/jni/Android.mk index 8c0a30a4d..f71dd65ba 100644 --- a/app/src/main/jni/Android.mk +++ b/app/src/main/jni/Android.mk @@ -1,4 +1,7 @@ LOCAL_PATH:= $(call my-dir) +ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) +PREFIX = $(PREFIX32) +endif ifeq ($(TARGET_ARCH_ABI),arm64-v8a) PREFIX = $(PREFIX64) endif diff --git a/buildscripts/scripts/mpv-android.sh b/buildscripts/scripts/mpv-android.sh index e7f849d79..a2ae4c3fb 100755 --- a/buildscripts/scripts/mpv-android.sh +++ b/buildscripts/scripts/mpv-android.sh @@ -24,11 +24,12 @@ nativeprefix () { fi } +prefix32=$(nativeprefix "armv7l") prefix64=$(nativeprefix "arm64") prefix_x64=$(nativeprefix "x86_64") prefix_x86=$(nativeprefix "x86") -PREFIX=$BUILD/prefix/armv7l PREFIX64=$prefix64 PREFIX_X64=$prefix_x64 PREFIX_X86=$prefix_x86 \ +PREFIX=$BUILD/prefix/armv7l PREFIX64=$prefix64 PREFIX32=$prefix32 PREFIX_X64=$prefix_x64 PREFIX_X86=$prefix_x86 \ ndk-build -C app/src/main -j$cores ./gradlew assembleDebug assembleRelease