mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-09-17 18:50:11 +02:00
Make RepoManifest work with gradle (at least for simple cases)
This commit is contained in:
parent
08380bfacc
commit
69ff89d361
@ -145,7 +145,13 @@ def check_repomanifest(app, sdk_path, branch=None):
|
|||||||
if not os.path.isdir(build_dir):
|
if not os.path.isdir(build_dir):
|
||||||
return (None, "Subdir '" + app['builds'][-1]['subdir'] + "'is not a valid directory")
|
return (None, "Subdir '" + app['builds'][-1]['subdir'] + "'is not a valid directory")
|
||||||
|
|
||||||
version, vercode, package = common.parse_androidmanifest(build_dir)
|
if os.path.exists(os.path.join(build_dir, 'AndroidManifest.xml')):
|
||||||
|
version, vercode, package = common.parse_androidmanifest(build_dir)
|
||||||
|
elif os.path.exists(os.path.join(build_dir, 'src', 'main', 'AndroidManifest.xml')):
|
||||||
|
# Alternate location for simple gradle locations...
|
||||||
|
version, vercode, package = common.parse_androidmanifest(os.path.join(build_dir, 'src', 'main'))
|
||||||
|
else:
|
||||||
|
return (None, "AndroidManifest.xml not found")
|
||||||
if not package:
|
if not package:
|
||||||
return (None, "Couldn't find package ID")
|
return (None, "Couldn't find package ID")
|
||||||
if package != app['id']:
|
if package != app['id']:
|
||||||
|
Loading…
Reference in New Issue
Block a user