ats-to-hashes.diff

# HG changeset patch
# Parent c50b611ee7a5ff93e4fc08350f3ef9ed31173af4
# User Nick Alexander <nalexander@mozilla.com>
diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -1088,23 +1088,23 @@ android-preqs = \
 
 # Add a predefined number of WebApp<num> classes to the WebApps class.
 # These are used so that each webapp can launch in its own process
 # Keep this number in sync with the max web apps in WebAppAllocator.java
 NUM_WEB_APPS=100
 WebAppManifestFragment.xml.in: WebAppManifestFragment.xml.frag
 	@rm -f $@
 	@for n in `$(PYTHON) -c "for x in range($(NUM_WEB_APPS)): print x"`; do \
-		cat $< | sed s,@APPNUM@,$$n,g >> $@ ; \
+		cat $< | sed s,#APPNUM#,$$n,g >> $@ ; \
 	done
 
 WebAppsFragments.java: WebAppsFragment.java.frag
 	@rm -f $@
 	@for n in `$(PYTHON) -c "for x in range($(NUM_WEB_APPS)): print x"`; do \
-		cat $< | sed s,@APPNUM@,$$n,g >> $@ ; \
+		cat $< | sed s,#APPNUM#,$$n,g >> $@ ; \
 	done
 
 # Bug 567884 - Need a way to find appropriate icons during packaging
 ifeq ($(MOZ_APP_NAME),fennec)
 ICON_PNG_FILES = $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/content/fennec_48x48.png
 ICON_HDPI_FILES = $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/content/fennec_72x72.png
 else
 ICON_PNG_FILES = $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/content/icon48.png
diff --git a/mobile/android/base/WebAppManifestFragment.xml.frag b/mobile/android/base/WebAppManifestFragment.xml.frag
--- a/mobile/android/base/WebAppManifestFragment.xml.frag
+++ b/mobile/android/base/WebAppManifestFragment.xml.frag
@@ -1,15 +1,15 @@
-        <activity android:name=".WebApps$WebApp@APPNUM@"
+        <activity android:name=".WebApps$WebApp#APPNUM#"
                   android:label="@string/webapp_generic_name"
                   android:configChanges="keyboard|keyboardHidden|mcc|mnc|orientation|screenSize"
                   android:windowSoftInputMode="stateUnspecified|adjustResize"
                   android:launchMode="singleInstance"
-                  android:process=":@ANDROID_PACKAGE_NAME@.WebApp@APPNUM@"
+                  android:process=":@ANDROID_PACKAGE_NAME@.WebApp#APPNUM#"
                   android:theme="@style/Gecko.NoActionBar">
             <intent-filter>
-                <action android:name="org.mozilla.gecko.WEBAPP@APPNUM@" />
+                <action android:name="org.mozilla.gecko.WEBAPP#APPNUM#" />
             </intent-filter>
             <intent-filter>
                 <action android:name="org.mozilla.gecko.ACTION_ALERT_CALLBACK" />
             </intent-filter>
         </activity>
 
diff --git a/mobile/android/base/WebAppsFragment.java.frag b/mobile/android/base/WebAppsFragment.java.frag
--- a/mobile/android/base/WebAppsFragment.java.frag
+++ b/mobile/android/base/WebAppsFragment.java.frag
@@ -1,2 +1,2 @@
-public static class WebApp@APPNUM@ extends WebApp { }
+public static class WebApp#APPNUM# extends WebApp { }