bug 979438 - Unify android target SDK versions, follow up to address nits r=nalexander
authorBrad Lassey <blassey@mozilla.com>
Fri, 28 Mar 2014 19:47:32 -0400
changeset 176084 07993ac505b3682785b8e8bab3bbacaaeb2f34b9
parent 176083 8a337a462886a4be0d35074976e1b04e65ab832b
child 176085 649d52ee8f9f51c39e7bda83745ed291a2c11dd0
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersnalexander
bugs979438
milestone31.0a1
bug 979438 - Unify android target SDK versions, follow up to address nits r=nalexander
build/autoconf/android.m4
embedding/android/geckoview_example/Makefile.in
mobile/android/geckoview_library/Makefile.in
--- a/build/autoconf/android.m4
+++ b/build/autoconf/android.m4
@@ -271,17 +271,17 @@ case "$target" in
 
         # Get the api level from "$android_sdk"/source.properties.
         ANDROID_TARGET_SDK=`$AWK -F = changequote(<<, >>)'<<$>>1 == "AndroidVersion.ApiLevel" {print <<$>>2}'changequote([, ]) "$android_sdk"/source.properties`
 
         if test -z "$ANDROID_TARGET_SDK" ; then
             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
             AC_MSG_ERROR([Unexpected error: the found android api value isn't a number! (found $ANDROID_TARGET_SDK)])
         fi
 
         if test $ANDROID_TARGET_SDK -lt $1 ; then
             AC_MSG_ERROR([The given Android SDK provides API level $ANDROID_TARGET_SDK ($1 or higher required).])
--- a/embedding/android/geckoview_example/Makefile.in
+++ b/embedding/android/geckoview_example/Makefile.in
@@ -1,13 +1,11 @@
 PP_TARGETS = properties manifest
 
 manifest = AndroidManifest.xml.in
-manifest_PATH = .
-manifest_deps := $(patsubst %.in,%,$(manifest))
 
 include $(topsrcdir)/config/rules.mk
 
 GARBAGE = \
 	AndroidManifest.xml \
 	proguard-project.txt \
 	project.properties \
 	ant.properties \
@@ -42,17 +40,17 @@ PACKAGE_DEPS = \
 	$(NSINSTALL) $(srcdir)/main.xml res/layout/
 
 src/org/mozilla/geckoviewexample/GeckoViewExample.java: $(srcdir)/GeckoViewExample.java
 	$(NSINSTALL) $(srcdir)/GeckoViewExample.java src/org/mozilla/geckoviewexample/
 
 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
 	$(RM) $(CURDIR)/res/layout/main.xml
 	$(NSINSTALL) $(srcdir)/main.xml res/layout/
 	$(RM) AndroidManifest.xml
 	mv AndroidManifest.xml.save AndroidManifest.xml
 	echo jar.libs.dir=libs >> project.properties
--- a/mobile/android/geckoview_library/Makefile.in
+++ b/mobile/android/geckoview_library/Makefile.in
@@ -8,43 +8,35 @@ GECKOVIEW_LIBRARY_FILES := \
   .classpath \
   .project \
   build.xml \
   $(NULL)
 
 PP_TARGETS = properties manifest project
 
 properties = local.properties.in
-properties_PATH = .
-properties_deps := $(patsubst %.in,%,$(properties))
+project = project.properties.in
+manifest = AndroidManifest.xml.in
 
-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 \
   libs \
   src \
   .deps \
   gen  \
   res \
   $(NULL)
 
 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
 
 	# Zip the assets into $(DIST)/geckoview_library/geckoview_assets.zip
 	cd $(_ABS_DIST)/fennec && \
 	$(ZIP) -q -r $(_ABS_DIST)/geckoview_library/geckoview_assets.zip assets
 
 	# Make empty directories to fit an Android project structure