Bug 944041 - Failure to make geckoview from m-c. r=khuey
authorBrad Lassey <blassey@mozilla.com>
Wed, 27 Nov 2013 15:14:26 -0500
changeset 175000 12df8614fc1d1c3fcea1e1ccafe213d5e1f69f6c
parent 174999 f9e31850d15e7d86c90d704c915fc5ca5022601d
child 175001 05643bb0c75e5fa3bd3d475375d6d28de87b2044
push id445
push userffxbld
push dateMon, 10 Mar 2014 22:05:19 +0000
treeherdermozilla-release@dc38b741b04e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs944041
milestone28.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 944041 - Failure to make geckoview from m-c. r=khuey
embedding/android/geckoview_example/Makefile.in
--- a/embedding/android/geckoview_example/Makefile.in
+++ b/embedding/android/geckoview_example/Makefile.in
@@ -16,19 +16,21 @@ GARBAGE_DIRS = \
 	bin \
 	libs \
 	res \
 	src \
 	$(NULL)
 
 ANDROID=$(ANDROID_SDK)/../../tools/android
 
+TARGET= $(notdir $(ANDROID_SDK))
+
 build.xml:
-	$(ANDROID) create project --name GeckoViewExample --target android-18 --path $(CURDIR) --activity GeckoViewExample --package org.mozilla.geckoviewexample
-	$(ANDROID) update project --target android-18 --path $(CURDIR) --library $(DEPTH)/mobile/android/geckoview_library
+	$(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
 	$(UNZIP) -o $(DIST)/geckoview_library/geckoview_assets.zip
 	$(NSINSTALL) $(srcdir)/main.xml res/layout/
 	$(NSINSTALL) $(srcdir)/AndroidManifest.xml .
 	$(NSINSTALL) $(srcdir)/GeckoViewExample.java src/org/mozilla/geckoviewexample/
 	echo jar.libs.dir=libs >> project.properties
 
 package: build.xml
 	ant debug