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 979438 - Unify android target SDK versions, follow up to address nits r=nalexander

Browse Source 
--HG--
extra : rebase_source : 841e8eece32e10d6d2c3443d5bcbf7ac935dd157
This commit is contained in:
Brad Lassey 2014-03-28 19:47:32 -04:00
parent ea0bcd5ded
commit 645cedd317
3 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/autoconf/android.m4
View File

@ -276,7 +276,7 @@ case "$target" in
AC_MSG_ERROR([Unexpected error: no AndroidVersion.ApiLevel field has been found in source.properties.])
fi
AC_DEFINE(ANDROID_TARGET_SDK,$ANDROID_TARGET_SDK)
AC_DEFINE_UNQUOTED(ANDROID_TARGET_SDK,$ANDROID_TARGET_SDK)
AC_SUBST(ANDROID_TARGET_SDK)
if ! test "$ANDROID_TARGET_SDK" -eq "$ANDROID_TARGET_SDK" ; then

4
embedding/android/geckoview_example/Makefile.in
View File

@ -1,8 +1,6 @@
PP_TARGETS = properties manifest
manifest = AndroidManifest.xml.in
manifest_PATH = .
manifest_deps := $(patsubst %.in,%,$(manifest))
include $(topsrcdir)/config/rules.mk
@ -47,7 +45,7 @@ src/org/mozilla/geckoviewexample/GeckoViewExample.java: $(srcdir)/GeckoViewExamp
assets/libxul.so: $(DIST)/geckoview_library/geckoview_assets.zip FORCE
$(UNZIP) -o $(DIST)/geckoview_library/geckoview_assets.zip
build.xml: AndroidManifest.xml
build.xml: $(CURDIR)/AndroidManifest.xml
mv AndroidManifest.xml AndroidManifest.xml.save
$(ANDROID) create project --name GeckoViewExample --target $(TARGET) --path $(CURDIR) --activity GeckoViewExample --package org.mozilla.geckoviewexample
$(ANDROID) update project --target $(TARGET) --path $(CURDIR) --library $(DEPTH)/mobile/android/geckoview_library

12
mobile/android/geckoview_library/Makefile.in
View File

@ -13,18 +13,10 @@ GECKOVIEW_LIBRARY_FILES := \
PP_TARGETS = properties manifest project
properties = local.properties.in
properties_PATH = .
properties_deps := $(patsubst %.in,%,$(properties))
project = project.properties.in
project_PATH = .
project_deps := $(patsubst %.in,%,$(properties))
manifest = AndroidManifest.xml.in
manifest_PATH = .
manifest_deps := AndroidManifest.xml
GARBAGE = $(GECKOVIEW_LIBRARY_FILES) $(properties_deps) $(manifest_deps)
GARBAGE = $(GECKOVIEW_LIBRARY_FILES) local.properties project.properties AndroidManifest.xml
GARBAGE_DIRS = \
bin \
@ -39,7 +31,7 @@ include $(topsrcdir)/config/rules.mk
_ABS_DIST = $(abspath $(DIST))
package: $(properties_deps) AndroidManifest.xml project.properties FORCE
package: local.properties project.properties AndroidManifest.xml FORCE
# Make directory for the zips
$(MKDIR) -p $(_ABS_DIST)/geckoview_library