From 01cf787fe9c736d105bff3fd1c1ccba15fb11ca0 Mon Sep 17 00:00:00 2001
From: Don Gagne <dongagne@outlook.com>
Date: Mon, 23 Dec 2019 12:35:52 -0800
Subject: [PATCH] Separate version codes for 32/64 bit

---
 deploy/google_play_upload.py    | 85 ---------------------------------
 tools/update_android_version.sh | 10 ++--
 2 files changed, 6 insertions(+), 89 deletions(-)
 delete mode 100755 deploy/google_play_upload.py

diff --git a/deploy/google_play_upload.py b/deploy/google_play_upload.py
deleted file mode 100755
index 48be3b043..000000000
--- a/deploy/google_play_upload.py
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright 2014 Google Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the 'License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Comes from here: https://github.com/googlesamples/android-play-publisher-api/blob/master/v3/python/upload_apks_rollout.py
-
-"""Uploads apk to rollout track with user fraction."""
-
-import argparse
-import sys
-from apiclient import sample_tools
-from oauth2client import client
-
-TRACK = 'rollout'
-USER_FRACTION = 0.2
-
-# Declare command-line flags.
-argparser = argparse.ArgumentParser(add_help=False)
-argparser.add_argument('package_name',
-                       help='The package name. Example: com.android.sample')
-argparser.add_argument('apk_file',
-                       nargs='?',
-                       default='test.apk',
-                       help='The path to the APK file to upload.')
-
-
-def main(argv):
-  # Authenticate and construct service.
-  service, flags = sample_tools.init(
-      argv,
-      'androidpublisher',
-      'v3',
-      __doc__,
-      __file__, parents=[argparser],
-      scope='https://www.googleapis.com/auth/androidpublisher')
-
-  # Process flags and read their values.
-  package_name = flags.package_name
-  apk_file = flags.apk_file
-
-  try:
-    edit_request = service.edits().insert(body={}, packageName=package_name)
-    result = edit_request.execute()
-    edit_id = result['id']
-
-    apk_response = service.edits().apks().upload(
-        editId=edit_id, packageName=package_name, media_body=apk_file).execute()
-
-    print 'Version code %d has been uploaded' % apk_response['versionCode']
-
-    track_response = service.edits().tracks().update(
-        editId=edit_id,
-        track=TRACK,
-        packageName=package_name,
-        body={u'releases': [{
-            u'versionCodes': [str([apk_response['versionCode']])],
-            u'status': u'completed',
-        }]}).execute()
-
-    print 'Track %s is set with releases: %s' % (
-        track_response['track'], str(track_response['releases']))
-
-    commit_request = service.edits().commit(
-        editId=edit_id, packageName=package_name).execute()
-
-    print 'Edit "%s" has been committed' % (commit_request['id'])
-
-  except client.AccessTokenRefreshError:
-    print ('The credentials have been revoked or expired, please re-run the '
-           'application to re-authorize')
-
-if __name__ == '__main__':
-  main(sys.argv)
diff --git a/tools/update_android_version.sh b/tools/update_android_version.sh
index 1f40486ae..b90226995 100755
--- a/tools/update_android_version.sh
+++ b/tools/update_android_version.sh
@@ -9,10 +9,12 @@ VERSIONCODE=$(($(($minor*10000)) + $VERSIONCODE))
 VERSIONCODE=$(($(($patch*1000)) + $VERSIONCODE))
 VERSIONCODE=$(($(($dev)) + $VERSIONCODE))
 
-# The android versionCode is for the entire package. It is the same for the 32 and 64 bit APKs.
-# Due to various screwups in versioning/tagging the version code needs to be prepended with 650 to
-# make it larger than all previous version codes.
-VERSIONCODE=650$VERSIONCODE
+# The 32 bit and 64 bit APKs each need there own version code.
+if [ "$1" = "32" ]; then
+    VERSIONCODE=330$VERSIONCODE
+else
+    VERSIONCODE=650$VERSIONCODE
+fi
 
 MANIFEST_FILE=android/AndroidManifest.xml
 
-- 
2.22.0