Issue 5170 - Force usage of Android version code v0 function

python/mozbuild/mozbuild/android_version_code.py

 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from __future__ import absolute_import, print_function
 
 import argparse
 import math
 import sys
 import time
@@ skipping 109 matching lines @@
     elif cpu_arch in ['x86']:
         version |= 1 << 2
     else:
         raise ValueError("Don't know how to compute android:versionCode "
                          "for CPU arch %s" % cpu_arch)
 
     return version
 
 def android_version_code(buildid, *args, **kwargs):
     base = int(str(buildid))
-    if base < V1_CUTOFF:
+    # Forcing the usage of v0 function
+    # See https://issues.adblockplus.org/ticket/5170
+    if True:
         return android_version_code_v0(buildid, *args, **kwargs)
     else:
         return android_version_code_v1(buildid, *args, **kwargs)

[anton, 2017/04/24 09:59:02]

minor Q: why not just remove it? ok if left for avoiding merge conflicts

 
 
 def main(argv):
     parser = argparse.ArgumentParser('Generate an android:versionCode',
                                      add_help=False)
     parser.add_argument('--verbose', action='store_true',
                         default=False,
                         help='Be verbose')
     parser.add_argument('--with-android-cpu-arch', dest='cpu_arch',
                         choices=['armeabi', 'armeabi-v7a', 'mips', 'x86'],
@@ skipping 11 matching lines @@
     code = android_version_code(args.buildid,
         cpu_arch=args.cpu_arch,
         min_sdk=args.min_sdk,
         max_sdk=args.max_sdk)
     print(code)
     return 0
 
 
 if __name__ == '__main__':
     sys.exit(main(sys.argv[1:]))