зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1344244 - Part 1: Accept newer Android lint version. r=glandium
MozReview-Commit-ID: KRwU0UKjkZZ --HG-- extra : rebase_source : 45325d8c37dcdaffa6ee6f22273db59963758509
This commit is contained in:
Родитель
09453dbd32
Коммит
6d62fe4972
|
@ -233,7 +233,7 @@ dnl Configure an Android SDK.
|
|||
dnl Arg 1: compile SDK version, like 23.
|
||||
dnl Arg 2: target SDK version, like 23.
|
||||
dnl Arg 3: list of build-tools versions, like "23.0.3 23.0.1".
|
||||
dnl Arg 4: target lint version, like "25.3.1" (note: we fall back to
|
||||
dnl Arg 4: list of target lint versions, like "25.3.2 25.3.1" (note: we fall back to
|
||||
dnl unversioned lint if this version is not found).
|
||||
AC_DEFUN([MOZ_ANDROID_SDK],
|
||||
[
|
||||
|
@ -362,23 +362,29 @@ case "$target" in
|
|||
;;
|
||||
esac
|
||||
|
||||
android_lint_target=$4
|
||||
AC_MSG_CHECKING([for Android lint classpath])
|
||||
ANDROID_LINT_CLASSPATH=""
|
||||
android_lint_versioned_jar="$ANDROID_SDK_ROOT/tools/lib/lint-$android_lint_target.jar"
|
||||
android_lint_unversioned_jar="$ANDROID_SDK_ROOT/tools/lib/lint.jar"
|
||||
for version in $4; do
|
||||
android_lint_versioned_jar="$ANDROID_SDK_ROOT/tools/lib/lint-$version.jar"
|
||||
if test -e "$android_lint_versioned_jar" ; then
|
||||
ANDROID_LINT_CLASSPATH="$ANDROID_LINT_CLASSPATH $android_lint_versioned_jar"
|
||||
ANDROID_LINT_CLASSPATH="$ANDROID_LINT_CLASSPATH $ANDROID_SDK_ROOT/tools/lib/lint-checks-$android_lint_target.jar"
|
||||
ANDROID_LINT_CLASSPATH="$ANDROID_LINT_CLASSPATH $ANDROID_SDK_ROOT/tools/lib/sdklib-$android_lint_target.jar"
|
||||
ANDROID_LINT_CLASSPATH="$ANDROID_LINT_CLASSPATH $ANDROID_SDK_ROOT/tools/lib/repository-$android_lint_target.jar"
|
||||
ANDROID_LINT_CLASSPATH="$ANDROID_LINT_CLASSPATH $ANDROID_SDK_ROOT/tools/lib/common-$android_lint_target.jar"
|
||||
ANDROID_LINT_CLASSPATH="$ANDROID_LINT_CLASSPATH $ANDROID_SDK_ROOT/tools/lib/lint-api-$android_lint_target.jar"
|
||||
elif test -e "$android_lint_unversioned_jar" ; then
|
||||
ANDROID_LINT_CLASSPATH="$ANDROID_LINT_CLASSPATH $ANDROID_SDK_ROOT/tools/lib/lint-checks-$version.jar"
|
||||
ANDROID_LINT_CLASSPATH="$ANDROID_LINT_CLASSPATH $ANDROID_SDK_ROOT/tools/lib/sdklib-$version.jar"
|
||||
ANDROID_LINT_CLASSPATH="$ANDROID_LINT_CLASSPATH $ANDROID_SDK_ROOT/tools/lib/repository-$version.jar"
|
||||
ANDROID_LINT_CLASSPATH="$ANDROID_LINT_CLASSPATH $ANDROID_SDK_ROOT/tools/lib/common-$version.jar"
|
||||
ANDROID_LINT_CLASSPATH="$ANDROID_LINT_CLASSPATH $ANDROID_SDK_ROOT/tools/lib/lint-api-$version.jar"
|
||||
break
|
||||
fi
|
||||
done
|
||||
if test -z "$ANDROID_LINT_CLASSPATH" ; then
|
||||
android_lint_unversioned_jar="$ANDROID_SDK_ROOT/tools/lib/lint.jar"
|
||||
if test -e "$android_lint_unversioned_jar" ; then
|
||||
ANDROID_LINT_CLASSPATH="$ANDROID_LINT_CLASSPATH $android_lint_unversioned_jar"
|
||||
ANDROID_LINT_CLASSPATH="$ANDROID_LINT_CLASSPATH $ANDROID_SDK_ROOT/tools/lib/lint-checks.jar"
|
||||
else
|
||||
AC_MSG_ERROR([Unable to find android sdk's lint jar. This probably means that you need to update android.m4 to find the latest version of lint-*.jar and all its dependencies. (looked for $android_lint_versioned_jar and $android_lint_unversioned_jar)])
|
||||
fi
|
||||
fi
|
||||
AC_MSG_RESULT([$ANDROID_LINT_CLASSPATH])
|
||||
AC_SUBST(ANDROID_LINT_CLASSPATH)
|
||||
|
||||
|
|
|
@ -2300,7 +2300,7 @@ dnl ========================================================
|
|||
if test -z "$gonkdir" ; then
|
||||
case "$MOZ_BUILD_APP" in
|
||||
mobile/android)
|
||||
MOZ_ANDROID_SDK(23, 23, 23.0.3 23.0.1, 25.3.2)
|
||||
MOZ_ANDROID_SDK(23, 23, 23.0.3 23.0.1, 25.3.2 25.3.1)
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
|
Загрузка…
Ссылка в новой задаче