bug-gnuzilla
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Bug-gnuzilla] Patch to Icecat 52.3.0 source for building Android AP


From: David Hedlund
Subject: Re: [Bug-gnuzilla] Patch to Icecat 52.3.0 source for building Android APK
Date: Mon, 4 Sep 2017 02:47:07 +0200
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0

I posted an email titled "IceCatMobile 52.3.0 released" to this mailing-list just a few hours ago.


On 2017-09-04 01:15, Reid Fleming wrote:
Not being sure where this should be sent, here is a patch against the Icecat
52.3.0 source for building an APK under Ubuntu 17.04.


diff -r -u icecat-52.3.0/mobile/android/base/AndroidManifest.xml.in 
icecat-52.3.0.new/mobile/android/base/AndroidManifest.xml.in
--- icecat-52.3.0/mobile/android/base/AndroidManifest.xml.in    2017-09-01 
13:37:34.000000000 -0700
+++ icecat-52.3.0.new/mobile/android/base/AndroidManifest.xml.in        
2017-09-02 10:19:05.331238060 -0700
@@ -3,7 +3,7 @@
  <manifest xmlns:android="http://schemas.android.com/apk/res/android";
        package="@ANDROID_PACKAGE_NAME@"
        android:installLocation="auto"
-      android:versionCode="@ANDROID_VERSION_CODE@"
+      android:versionCode="123456789"
        android:versionName="@MOZ_APP_VERSION@"
  #ifdef MOZ_ANDROID_SHARED_ID
        android:sharedUserId="@MOZ_ANDROID_SHARED_ID@"
diff -r -u icecat-52.3.0/mobile/android/base/android-services.mozbuild 
icecat-52.3.0.new/mobile/android/base/android-services.mozbuild
--- icecat-52.3.0/mobile/android/base/android-services.mozbuild 2017-09-01 
13:37:37.000000000 -0700
+++ icecat-52.3.0.new/mobile/android/base/android-services.mozbuild     
2017-09-02 10:18:29.762880292 -0700
@@ -831,11 +831,11 @@
      'fxa/authenticator/FxAccountLoginDelegate.java',
      'fxa/authenticator/FxAccountLoginException.java',
      'fxa/authenticator/FxADefaultLoginStateMachineDelegate.java',
-    'fxa/IceCatAccounts.java',
      'fxa/FxAccountConstants.java',
      'fxa/FxAccountDevice.java',
      'fxa/FxAccountDeviceRegistrator.java',
      'fxa/FxAccountPushHandler.java',
+    'fxa/IceCatAccounts.java',
      'fxa/login/BaseRequestDelegate.java',
      'fxa/login/Cohabiting.java',
      'fxa/login/Doghouse.java',
@@ -955,8 +955,8 @@
      'sync/repositories/android/CachedSQLiteOpenHelper.java',
      'sync/repositories/android/ClientsDatabase.java',
      'sync/repositories/android/ClientsDatabaseAccessor.java',
-    'sync/repositories/android/IceCatMobileTabsRepository.java',
      'sync/repositories/android/FormHistoryRepositorySession.java',
+    'sync/repositories/android/IceCatMobileTabsRepository.java',
      'sync/repositories/android/PasswordsRepositorySession.java',
      'sync/repositories/android/RepoUtils.java',
      'sync/repositories/android/VisitsHelper.java',
@@ -1038,12 +1038,12 @@
      'sync/stage/CheckPreconditionsStage.java',
      'sync/stage/CompletedStage.java',
      'sync/stage/EnsureCrypto5KeysStage.java',
-    'sync/stage/IceCatMobileTabsServerSyncStage.java',
      'sync/stage/FetchInfoCollectionsStage.java',
      'sync/stage/FetchInfoConfigurationStage.java',
      'sync/stage/FetchMetaGlobalStage.java',
      'sync/stage/FormHistoryServerSyncStage.java',
      'sync/stage/GlobalSyncStage.java',
+    'sync/stage/IceCatMobileTabsServerSyncStage.java',
      'sync/stage/NoSuchStageException.java',
      'sync/stage/PasswordsServerSyncStage.java',
      'sync/stage/SafeConstrainedServer11Repository.java',
diff -r -u icecat-52.3.0/python/mozboot/mozboot/android.py 
icecat-52.3.0.new/python/mozboot/mozboot/android.py
--- icecat-52.3.0/python/mozboot/mozboot/android.py     2017-09-01 
13:37:03.000000000 -0700
+++ icecat-52.3.0.new/python/mozboot/mozboot/android.py 2017-09-02 
21:12:31.026753456 -0700
@@ -231,7 +231,7 @@
      # Bug 1171232: The |android| tool behaviour has changed; we no longer can
      # see what packages are installed easily.  Force installing everything 
until
      # we find a way to actually see the missing packages.
-    missing = packages
+    missing = None
      if not missing:
          print(NOT_INSTALLING_ANDROID_PACKAGES % ', '.join(packages))
          return
diff -r -u icecat-52.3.0/python/mozboot/mozboot/debian.py 
icecat-52.3.0.new/python/mozboot/mozboot/debian.py
--- icecat-52.3.0/python/mozboot/mozboot/debian.py      2017-09-01 
13:37:03.000000000 -0700
+++ icecat-52.3.0.new/python/mozboot/mozboot/debian.py  2017-09-02 
09:49:58.514890050 -0700
@@ -74,7 +74,7 @@
      # (mobile/android) for all Debian-derived distros (such as Ubuntu).
      MOBILE_ANDROID_COMMON_PACKAGES = [
          'zlib1g-dev',  # mobile/android requires system zlib.
-        'openjdk-7-jdk',
+        'openjdk-8-jdk',
          'wget',  # For downloading the Android SDK and NDK.
          'libncurses5:i386',  # See comments about i386 below.
          'libstdc++6:i386',
diff -r -u icecat-52.3.0/python/mozbuild/mozbuild/android_version_code.py 
icecat-52.3.0.new/python/mozbuild/mozbuild/android_version_code.py
--- icecat-52.3.0/python/mozbuild/mozbuild/android_version_code.py      
2017-09-01 13:37:02.000000000 -0700
+++ icecat-52.3.0.new/python/mozbuild/mozbuild/android_version_code.py  
2017-09-02 10:33:07.432149453 -0700
@@ -115,7 +115,7 @@
              pass
          # This used to compare to 11. The 15+ APK directly supersedes 11+, so
          # we reuse this check.
-        elif min_sdk == 15:
+        elif min_sdk == 15 or min_sdk == 11:
              version |= 1 << 0
          else:
              raise ValueError("Don't know how to compute android:versionCode "


--
http://gnuzilla.gnu.org




reply via email to

[Prev in Thread] Current Thread [Next in Thread]