bug 703080 - we need a way to determine the appname from the apk r=aki,dougt
authorBrad Lassey <blassey@mozilla.com>
Thu, 17 Nov 2011 20:15:29 -0500
changeset 83532 1d48e24177af53bc9a4674dea755cc36606bb2c9
parent 83531 4aa196ded1b077d3543151def5de8bba1d30d629
child 83533 00a5471356578b8b0e162455e3ca7174de5146d4
push id519
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 00:38:35 +0000
treeherdermozilla-beta@788ea1ef610b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaki, dougt
bugs703080
milestone11.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 703080 - we need a way to determine the appname from the apk r=aki,dougt
embedding/android/Makefile.in
embedding/android/package-name.txt.in
mobile/android/installer/package-manifest.in
mobile/xul/installer/package-manifest.in
toolkit/mozapps/installer/packager.mk
--- a/embedding/android/Makefile.in
+++ b/embedding/android/Makefile.in
@@ -40,16 +40,18 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/ipc/app/defs.mk
 
 DIRS = locales
 
+DIST_FILES = package-name.txt
+
 JAVAFILES = \
   AlertNotification.java \
   AwesomeBar.java \
   AwesomeBarTabs.java \
   BrowserToolbar.java \
   ConfirmPreference.java \
   DoorHanger.java \
   DoorHangerPopup.java \
@@ -367,17 +369,17 @@ include $(topsrcdir)/config/android-comm
 
 # Note that we're going to set up a dependency directly between embed_android.dex and the java files
 # Instead of on the .class files, since more than one .class file might be produced per .java file
 classes.dex: $(JAVAFILES) $(PROCESSEDJAVAFILES) R.java
 	$(NSINSTALL) -D classes
 	$(JAVAC) $(JAVAC_FLAGS) -Xlint:unchecked -Xlint:deprecation -d classes  $(addprefix $(srcdir)/,$(JAVAFILES)) $(PROCESSEDJAVAFILES) R.java
 	$(DX) --dex --output=$@ classes
 
-AndroidManifest.xml $(PROCESSEDJAVAFILES): % : %.in
+AndroidManifest.xml $(PROCESSEDJAVAFILES) package-name.txt: % : %.in
 	$(PYTHON) $(topsrcdir)/config/Preprocessor.py \
              $(AUTOMATION_PPARGS) $(DEFINES) $(ACDEFINES) $< > $@
 
 res/drawable/icon.png: $(MOZ_APP_ICON)
 	$(NSINSTALL) -D res/drawable
 	cp $(ICON_PATH) $@
 
 res/drawable-hdpi/icon.png: $(MOZ_APP_ICON)
@@ -457,10 +459,11 @@ res/values-$(AB_rCD)/strings.xml: $(LOCA
 	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) \
 	  -DBRANDPATH="$(call core_abspath,$(LOCALIZED_BRANDPATH))" \
 	  -DSTRINGSPATH="$(call core_abspath,$(LOCALIZED_STRINGSPATH))" \
 	  $(srcdir)/strings.xml.in \
 	  > $@
 
 chrome:: $(LOCALIZED_STRINGS_XML)
 
-libs:: classes.dex
+libs:: classes.dex package-name.txt
 	$(INSTALL) classes.dex $(FINAL_TARGET)
+	$(INSTALL) package-name.txt $(FINAL_TARGET)
new file mode 100644
--- /dev/null
+++ b/embedding/android/package-name.txt.in
@@ -0,0 +1,2 @@
+#filter substitution
+@ANDROID_PACKAGE_NAME@
--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -77,16 +77,17 @@
 @BINPATH@/msvcr110.dll
 #endif
 
 #endif
 
 #ifdef ANDROID
 @BINPATH@/AndroidManifest.xml
 @BINPATH@/resources.arsc
+@BINPATH@/package-name.txt
 @BINPATH@/classes.dex
 @BINPATH@/@DLL_PREFIX@mozutils@DLL_SUFFIX@
 @BINPATH@/res/drawable
 @BINPATH@/res/drawable-hdpi
 @BINPATH@/res/layout
 #endif
 
 #ifdef MOZ_PLATFORM_MAEMO
--- a/mobile/xul/installer/package-manifest.in
+++ b/mobile/xul/installer/package-manifest.in
@@ -77,16 +77,17 @@
 @BINPATH@/msvcr110.dll
 #endif
 
 #endif
 
 #ifdef ANDROID
 @BINPATH@/AndroidManifest.xml
 @BINPATH@/resources.arsc
+@BINPATH@/package-name.txt
 @BINPATH@/classes.dex
 @BINPATH@/@DLL_PREFIX@mozutils@DLL_SUFFIX@
 @BINPATH@/res/drawable
 @BINPATH@/res/drawable-hdpi
 @BINPATH@/res/layout
 #endif
 
 #ifdef MOZ_PLATFORM_MAEMO
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -285,16 +285,17 @@ DIST_FILES = \
   libsmime3.so \
   libxul.so \
   libxpcom.so \
   libnssckbi.so \
   libfreebl3.so \
   libsoftokn3.so \
   extensions \
   application.ini \
+  package-name.txt \
   platform.ini \
   greprefs.js \
   browserconfig.properties \
   blocklist.xml \
   chrome.manifest \
   update.locale \
   removed-files \
   $(NULL)