bug 655427 - make sharedIDs used by automation not depend on package nam a+r=mfinkle
authorBrad Lassey <blassey@mozilla.com>
Wed, 11 May 2011 14:07:28 -0400
changeset 69352 993a4122bacfd18c76a302e3fbd39316b1fbbedf
parent 69351 dfb70d26874e54015255a355974654c0c8c7c056
child 69353 5be875928599315bcdda2d98ea0a743e3ebacaf8
push id19935
push userblassey@mozilla.com
push dateWed, 11 May 2011 18:09:32 +0000
treeherdermozilla-central@993a4122bacf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs655427
milestone6.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 655427 - make sharedIDs used by automation not depend on package nam a+r=mfinkle
embedding/android/AndroidManifest.xml.in
embedding/android/Makefile.in
--- a/embedding/android/AndroidManifest.xml.in
+++ b/embedding/android/AndroidManifest.xml.in
@@ -1,16 +1,16 @@
 #filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="@ANDROID_PACKAGE_NAME@"
       android:installLocation="auto"
       android:versionCode="@ANDROID_VERSION_CODE@"
       android:versionName="@MOZ_APP_VERSION@"
-      android:sharedUserId="@ANDROID_PACKAGE_NAME@.sharedID">
+      android:sharedUserId="@MOZ_ANDROID_SHARED_ID@">
     <uses-sdk android:minSdkVersion="5"
               android:targetSdkVersion="5"/>
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
--- a/embedding/android/Makefile.in
+++ b/embedding/android/Makefile.in
@@ -93,19 +93,25 @@ GARBAGE += \
   $(NULL)
 
 GARBAGE_DIRS += classes res
 
 # Bug 567884 - Need a way to find appropriate icons during packaging
 ifeq ($(MOZ_APP_NAME),fennec)
 ICON_PATH = $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/content/fennec_48x48.png
 ICON_PATH_HDPI = $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/content/fennec_72x72.png
+ifeq (,$(MOZ_OFFICIAL_BRANDING))
+DEFINES += -DMOZ_ANDROID_SHARED_ID="org.mozilla.fennec.sharedID"
+else
+DEFINES += -DMOZ_ANDROID_SHARED_ID="org.mozilla.firefox.sharedID"
+endif
 else
 ICON_PATH = $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/content/icon48.png
 ICON_PATH_HDPI = $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/content/icon64.png
+DEFINES += -DMOZ_ANDROID_SHARED_ID="$(ANDROID_PACKAGE_NAME).sharedID"
 endif
 
 RES_LAYOUT = \
   res/layout/notification_progress.xml \
   res/layout/notification_progress_text.xml \
   res/layout/notification_icon_text.xml \
   $(NULL)