chiark / gitweb /
add comments to gradle output directories
authorMarcus Hoffmann <bubuiic@aol.com>
Sat, 26 Aug 2017 15:03:13 +0000 (17:03 +0200)
committerMarcus Hoffmann <bubuiic@aol.com>
Sat, 26 Aug 2017 15:03:13 +0000 (17:03 +0200)
fdroidserver/build.py

index c43b18fdeac25f9d179be5c280c18aa190a8ba79..3bca0a8fda7749ab6ecd4fd465d4fe36bcc1ba6b 100644 (file)
@@ -803,10 +803,16 @@ def build_local(app, build, vcs, build_dir, output_dir, log_dir, srclib_dir, ext
     elif omethod == 'gradle':
         src = None
         apk_dirs = [
+            # gradle plugin >= 3.0
             os.path.join(root_dir, 'build', 'outputs', 'apk', 'release'),
+            # gradle plugin < 3.0 and >= 0.11
             os.path.join(root_dir, 'build', 'outputs', 'apk'),
+            # really old path
             os.path.join(root_dir, 'build', 'apk'),
             ]
+        # If we build with gradle flavours with gradle plugin >= 3.0 the apk will be in
+        # a subdirectory corresponding to the flavour command used, but with different
+        # capitalization.
         if flavours_cmd:
             apk_dirs.append(os.path.join(root_dir, 'build', 'outputs', 'apk', transform_first_char(flavours_cmd, str.lower), 'release'))
         for apks_dir in apk_dirs: