wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 673168 - Back out 32135b36a00e (bug 669424) because it breaks upgrades on Android

Browse Source
This commit is contained in:
Matt Brubeck 2011-07-21 14:12:51 -07:00
parent e7ffa2c6f6
commit 717d71ee1f
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
embedding/android/AndroidManifest.xml.in
View File

@ -4,7 +4,8 @@
package="@ANDROID_PACKAGE_NAME@"
android:installLocation="auto"
android:versionCode="@ANDROID_VERSION_CODE@"
android:versionName="@MOZ_APP_VERSION@">
android:versionName="@MOZ_APP_VERSION@"
android:sharedUserId="@MOZ_ANDROID_SHARED_ID@">
<uses-sdk android:minSdkVersion="5"
android:targetSdkVersion="5"/>

8
embedding/android/Makefile.in
View File

@ -101,9 +101,17 @@ GARBAGE_DIRS += classes res
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 (org.mozilla.fennec_unofficial,$(ANDROID_PACKAGE_NAME))
DEFINES += -DMOZ_ANDROID_SHARED_ID="org.mozilla.fennec_unofficial.sharedID"
else 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 = \