bug 969725 - geckoview_example uses incorrect main.xml layout and AndroidManifest r=nalexander

embedding/android/geckoview_example/Makefile.in

@@ -25,29 +25,33 @@ ANDROID=$(ANDROID_SDK)/../../tools/android
 TARGET= $(notdir $(ANDROID_SDK))
 
 PACKAGE_DEPS = \
-	build.xml \
-	res/layout/main.xml \
-	AndroidManifest.xml \
-	src/org/mozilla/geckoviewexample/GeckoViewExample.java \
 	assets/libxul.so \
+	build.xml \
+	src/org/mozilla/geckoviewexample/GeckoViewExample.java \
+	$(CURDIR)/res/layout/main.xml \
+	$(CURDIR)/AndroidManifest.xml \
 	$(NULL)
 
-res/layout/main.xml: $(srcdir)/main.xml
+$(CURDIR)/res/layout/main.xml: $(srcdir)/main.xml
 	$(NSINSTALL) $(srcdir)/main.xml res/layout/
 
-AndroidManifest.xml: $(srcdir)/AndroidManifest.xml
-	$(NSINSTALL) $(srcdir)/AndroidManifest.xml .
+$(CURDIR)/AndroidManifest.xml: $(srcdir)/AndroidManifest.xml
+	$(NSINSTALL) $(srcdir)/AndroidManifest.xml $(CURDIR)
 
 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
+assets/libxul.so: $(DIST)/geckoview_library/geckoview_assets.zip FORCE
 	$(UNZIP) -o $(DIST)/geckoview_library/geckoview_assets.zip
 
 build.xml:
 	$(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) $(CURDIR)/AndroidManifest.xml
+	$(NSINSTALL) $(srcdir)/AndroidManifest.xml $(CURDIR)
 	echo jar.libs.dir=libs >> project.properties
 
-package: $(PACKAGE_DEPS)
+package: $(PACKAGE_DEPS) FORCE
 	ant debug

mobile/android/geckoview_library/Makefile.in

@@ -33,7 +33,7 @@ include $(topsrcdir)/config/rules.mk
 
 _ABS_DIST = $(abspath $(DIST))
 
-package: $(properties_deps)
+package: $(properties_deps) FORCE
 	# Make directory for the zips
 	$(MKDIR) -p $(_ABS_DIST)/geckoview_library