Skip to content

M
mpd
Commit a4e0b524 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

configure.ac, Makefile.am: add variable ANDROID_ABI

parent 98efb4f6
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
Makefile.am
View file @ a4e0b524
...@@ -341,7 +341,7 @@ android/build/include/org_musicpd_Bridge.h: android/build/classes.dex ...@@ -341,7 +341,7 @@ android/build/include/org_musicpd_Bridge.h: android/build/classes.dex
BUILT_SOURCES = android/build/include/org_musicpd_Bridge.h BUILT_SOURCES = android/build/include/org_musicpd_Bridge.h
android/build/lib/armeabi-v7a/libmpd.so: libmpd.so android/build/lib/$(ANDROID_ABI)/libmpd.so: libmpd.so
mkdir -p $(@D) mkdir -p $(@D)
rm -f $@ rm -f $@
$(STRIP) -o $@ $< $(STRIP) -o $@ $<
...@@ -351,7 +351,7 @@ android/build/res/drawable/icon.png: mpd.svg ...@@ -351,7 +351,7 @@ android/build/res/drawable/icon.png: mpd.svg
rsvg-convert --width=48 --height=48 $< -o $@ rsvg-convert --width=48 --height=48 $< -o $@
.DELETE_ON_ERROR: android/build/unsigned.apk .DELETE_ON_ERROR: android/build/unsigned.apk
android/build/unsigned.apk: android/build/classes.dex android/build/resources.apk android/build/lib/armeabi-v7a/libmpd.so android/build/unsigned.apk: android/build/classes.dex android/build/resources.apk android/build/lib/$(ANDROID_ABI)/libmpd.so
cp android/build/resources.apk $@ cp android/build/resources.apk $@
cd $(dir $@) && zip -q -r $(notdir $@) classes.dex lib cd $(dir $@) && zip -q -r $(notdir $@) classes.dex lib
......
configure.ac
View file @ a4e0b524
...@@ -186,6 +186,7 @@ AC_ARG_WITH([android-sdk], ...@@ -186,6 +186,7 @@ AC_ARG_WITH([android-sdk],
[Directory for Android SDK]), [Directory for Android SDK]),
[], [with_android_sdk=no]) [], [with_android_sdk=no])
android_abi=""
if test x$host_is_android = xyes; then if test x$host_is_android = xyes; then
if test x$with_android_sdk = xno; then if test x$with_android_sdk = xno; then
AC_MSG_ERROR([Android build requires option --with-android-sdk=DIR]) AC_MSG_ERROR([Android build requires option --with-android-sdk=DIR])
...@@ -194,9 +195,12 @@ if test x$host_is_android = xyes; then ...@@ -194,9 +195,12 @@ if test x$host_is_android = xyes; then
if ! test -x $with_android_sdk/tools/android; then if ! test -x $with_android_sdk/tools/android; then
AC_MSG_ERROR([Android SDK not found in $with_android_sdk]) AC_MSG_ERROR([Android SDK not found in $with_android_sdk])
fi fi
android_abi="armeabi-v7a"
fi fi
AC_SUBST(ANDROID_SDK, [$with_android_sdk]) AC_SUBST(ANDROID_SDK, [$with_android_sdk])
AC_SUBST(ANDROID_ABI, [$android_abi])
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl Language Checks dnl Language Checks
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment