mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Backed out changeset cb8ca90a354d, 894afa1b44ae (bug 1042382)
This commit is contained in:
parent
a71af504bb
commit
e0a0aeac29
@ -408,38 +408,4 @@ case "$target" in
|
||||
;;
|
||||
esac
|
||||
|
||||
MOZ_ARG_WITH_STRING(android-min-sdk,
|
||||
[ --with-android-min-sdk=[VER] Impose a minimum Firefox for Android SDK version],
|
||||
[ MOZ_ANDROID_MIN_SDK_VERSION=$withval ])
|
||||
|
||||
MOZ_ARG_WITH_STRING(android-max-sdk,
|
||||
[ --with-android-max-sdk=[VER] Impose a maximum Firefox for Android SDK version],
|
||||
[ MOZ_ANDROID_MAX_SDK_VERSION=$withval ])
|
||||
|
||||
if test -n "$MOZ_ANDROID_MIN_SDK_VERSION"; then
|
||||
if test $MOZ_ANDROID_MIN_SDK_VERSION -lt $1 ; then
|
||||
AC_MSG_ERROR([--with-android-min-sdk must be at least $1.])
|
||||
fi
|
||||
|
||||
if test -n "$MOZ_ANDROID_MAX_SDK_VERSION"; then
|
||||
if test $MOZ_ANDROID_MAX_SDK_VERSION -lt $MOZ_ANDROID_MIN_SDK_VERSION ; then
|
||||
AC_MSG_ERROR([--with-android-max-sdk must be at least the value of --with-android-min-sdk.])
|
||||
fi
|
||||
fi
|
||||
|
||||
if test $MOZ_ANDROID_MIN_SDK_VERSION -gt $ANDROID_TARGET_SDK ; then
|
||||
AC_MSG_ERROR([--with-android-min-sdk is expected to be less than $ANDROID_TARGET_SDK])
|
||||
fi
|
||||
|
||||
AC_DEFINE_UNQUOTED(MOZ_ANDROID_MIN_SDK_VERSION, $MOZ_ANDROID_MIN_SDK_VERSION)
|
||||
fi
|
||||
|
||||
if test -n "$MOZ_ANDROID_MAX_SDK_VERSION"; then
|
||||
if test $MOZ_ANDROID_MAX_SDK_VERSION -lt $1 ; then
|
||||
AC_MSG_ERROR([--with-android-max-sdk must be at least $1.])
|
||||
fi
|
||||
|
||||
AC_DEFINE_UNQUOTED(MOZ_ANDROID_MAX_SDK_VERSION, $MOZ_ANDROID_MAX_SDK_VERSION)
|
||||
fi
|
||||
|
||||
])
|
||||
|
@ -9,10 +9,7 @@
|
||||
android:sharedUserId="@MOZ_ANDROID_SHARED_ID@"
|
||||
#endif
|
||||
>
|
||||
<uses-sdk android:minSdkVersion="@MOZ_ANDROID_MIN_SDK_VERSION@"
|
||||
#ifdef MOZ_ANDROID_MAX_SDK_VERSION
|
||||
android:maxSdkVersion="@MOZ_ANDROID_MAX_SDK_VERSION@"
|
||||
#endif
|
||||
<uses-sdk android:minSdkVersion="9"
|
||||
android:targetSdkVersion="@ANDROID_TARGET_SDK@"/>
|
||||
|
||||
#include ../services/manifests/AnnouncementsAndroidManifest_permissions.xml.in
|
||||
|
@ -12,10 +12,6 @@ MOZ_BRANDING_DIRECTORY=mobile/android/branding/unofficial
|
||||
MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/android/branding/official
|
||||
# MOZ_APP_DISPLAYNAME is set by branding/configure.sh
|
||||
|
||||
# We support Android SDK version 9 and up by default.
|
||||
# See the --enable-android-min-sdk and --enable-android-max-sdk arguments in configure.in.
|
||||
MOZ_ANDROID_MIN_SDK_VERSION=9
|
||||
|
||||
MOZ_SAFE_BROWSING=1
|
||||
|
||||
MOZ_DISABLE_CRYPTOLEGACY=1
|
||||
|
Loading…
Reference in New Issue
Block a user