wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 759041 - Bring in Android compatibility libraries. r=blassey

Browse Source
This commit is contained in:
Wes Johnston 2012-11-08 07:45:29 -08:00
parent 429f1cfe90
commit 7e7639ef9e
5 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build/autoconf/android.m4
View File

@ -243,8 +243,17 @@ case "$target" in
android_platform_tools="$android_sdk"/tools # SDK Tools < r8 android_platform_tools="$android_sdk"/tools # SDK Tools < r8
fi fi
ANDROID_SDK="${android_sdk}" ANDROID_SDK="${android_sdk}"
if test -e "${android_sdk}/../../extras/android/compatibility/v4/android-support-v4.jar" ; then
ANDROID_COMPAT_LIB="${android_sdk}/../../extras/android/compatibility/v4/android-support-v4.jar"
else
ANDROID_COMPAT_LIB="${android_sdk}/../../extras/android/support/v4/android-support-v4.jar";
fi
ANDROID_PLATFORM_TOOLS="${android_platform_tools}" ANDROID_PLATFORM_TOOLS="${android_platform_tools}"
AC_SUBST(ANDROID_SDK) AC_SUBST(ANDROID_SDK)
AC_SUBST(ANDROID_COMPAT_LIB)
if ! test -e $ANDROID_COMPAT_LIB ; then
AC_MSG_ERROR([You must download the andrioid compatibility library when targeting Android. (found $ANDROID_COMPAT_LIB)])
fi
AC_SUBST(ANDROID_PLATFORM_TOOLS) AC_SUBST(ANDROID_PLATFORM_TOOLS)
;; ;;
esac esac

2
build/mobile/robocop/Makefile.in
View File

@ -93,7 +93,7 @@ classes.dex: $(_JAVA_HARNESS)
classes.dex: $(_JAVA_TESTS) classes.dex: $(_JAVA_TESTS)
$(NSINSTALL) -D classes $(NSINSTALL) -D classes
$(JAVAC) $(JAVAC_FLAGS) -d classes $(JAVAFILES) $(_JAVA_HARNESS) $(addprefix $(DEPTH)/mobile/android/base/tests/,$(_JAVA_TESTS)) $(JAVAC) $(JAVAC_FLAGS) -d classes $(JAVAFILES) $(_JAVA_HARNESS) $(addprefix $(DEPTH)/mobile/android/base/tests/,$(_JAVA_TESTS))
$(DX) --dex --output=$@ classes $(ROBOTIUM_PATH) $(DX) --dex --output=$@ classes $(ROBOTIUM_PATH) $(ANDROID_COMPT_LIB)
robocop.ap_: AndroidManifest.xml $(TESTPATH)/assets/* robocop.ap_: AndroidManifest.xml $(TESTPATH)/assets/*
$(AAPT) package -f -M AndroidManifest.xml -I $(ANDROID_SDK)/android.jar -I . -S res -A $(TESTPATH)/assets -F $@ -J ./ $(AAPT) package -f -M AndroidManifest.xml -I $(ANDROID_SDK)/android.jar -I . -S res -A $(TESTPATH)/assets -F $@ -J ./

2
config/android-common.mk
View File

@ -23,7 +23,7 @@ endif
# For Android, this defaults to $(ANDROID_SDK)/android.jar # For Android, this defaults to $(ANDROID_SDK)/android.jar
ifndef JAVA_BOOTCLASSPATH ifndef JAVA_BOOTCLASSPATH
JAVA_BOOTCLASSPATH = $(ANDROID_SDK)/android.jar JAVA_BOOTCLASSPATH = $(ANDROID_SDK)/android.jar:$(ANDROID_COMPAT_LIB)
endif endif
# For Android, we default to 1.5 # For Android, we default to 1.5

9
js/src/build/autoconf/android.m4
View File

@ -243,8 +243,17 @@ case "$target" in
android_platform_tools="$android_sdk"/tools # SDK Tools < r8 android_platform_tools="$android_sdk"/tools # SDK Tools < r8
fi fi
ANDROID_SDK="${android_sdk}" ANDROID_SDK="${android_sdk}"
if test -e "${android_sdk}/../../extras/android/compatibility/v4/android-support-v4.jar" ; then
ANDROID_COMPAT_LIB="${android_sdk}/../../extras/android/compatibility/v4/android-support-v4.jar"
else
ANDROID_COMPAT_LIB="${android_sdk}/../../extras/android/support/v4/android-support-v4.jar";
fi
ANDROID_PLATFORM_TOOLS="${android_platform_tools}" ANDROID_PLATFORM_TOOLS="${android_platform_tools}"
AC_SUBST(ANDROID_SDK) AC_SUBST(ANDROID_SDK)
AC_SUBST(ANDROID_COMPAT_LIB)
if ! test -e $ANDROID_COMPAT_LIB ; then
AC_MSG_ERROR([You must download the andrioid compatibility library when targeting Android. (found $ANDROID_COMPAT_LIB)])
fi
AC_SUBST(ANDROID_PLATFORM_TOOLS) AC_SUBST(ANDROID_PLATFORM_TOOLS)
;; ;;
esac esac

2
mobile/android/base/Makefile.in
View File

@ -1043,7 +1043,7 @@ include $(topsrcdir)/config/android-common.mk
# indices. # indices.
classes.dex: jars/gecko-browser.jar classes.dex: jars/gecko-browser.jar
@echo "DX classes.dex" @echo "DX classes.dex"
$(DX) --dex --output=classes.dex jars $(DX) --dex --output=classes.dex jars $(ANDROID_COMPAT_LIB)
jars/gecko-browser.jar: jars/gecko-mozglue.jar jars/gecko-util.jar jars/sync-thirdparty.jar $(addprefix $(srcdir)/,$(FENNEC_JAVA_FILES)) $(FENNEC_PP_JAVA_FILES) $(addprefix $(srcdir)/,$(SYNC_JAVA_FILES)) $(SYNC_PP_JAVA_FILES) R.java jars/gecko-browser.jar: jars/gecko-mozglue.jar jars/gecko-util.jar jars/sync-thirdparty.jar $(addprefix $(srcdir)/,$(FENNEC_JAVA_FILES)) $(FENNEC_PP_JAVA_FILES) $(addprefix $(srcdir)/,$(SYNC_JAVA_FILES)) $(SYNC_PP_JAVA_FILES) R.java
@echo "JAR gecko-browser.jar" @echo "JAR gecko-browser.jar"