kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-14 02:50:12 +01:00
Code Activity

Get rid of all the debugging flags, not just the ones in the main project

Browse Source
This commit is contained in:
Daniel Martí 2014-02-11 17:56:36 +01:00
parent 255d4a03ef
commit e5539303ff
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fdroidserver/common.py
View File

@ -660,6 +660,17 @@ def ant_subprojects(root_dir):
subprojects.insert(0, relp) subprojects.insert(0, relp)
return subprojects return subprojects
def remove_debuggable_flags(root_dir):
# Remove forced debuggable flags
logging.info("Removing debuggable flags")
for root, dirs, files in os.walk(root_dir):
if 'AndroidManifest.xml' in files:
path = os.path.join(root, 'AndroidManifest.xml')
p = FDroidPopen(['sed','-i',
's/android:debuggable="[^"]*"//g', path])
if p.returncode != 0:
raise BuildException("Failed to remove debuggable flags of %s" % path)
# Extract some information from the AndroidManifest.xml at the given path. # Extract some information from the AndroidManifest.xml at the given path.
# Returns (version, vercode, package), any or all of which might be None. # Returns (version, vercode, package), any or all of which might be None.
# All values returned are strings. # All values returned are strings.
@ -816,6 +827,9 @@ def getsrclib(spec, srclib_dir, srclibpaths=[], subdir=None,
place_srclib(libdir, n, s_tuple[2]) place_srclib(libdir, n, s_tuple[2])
n+=1 n+=1
remove_signing_keys(sdir)
remove_debuggable_flags(sdir)
if prepare: if prepare:
if srclib["Prepare"]: if srclib["Prepare"]:
@ -826,8 +840,6 @@ def getsrclib(spec, srclib_dir, srclibpaths=[], subdir=None,
raise BuildException("Error running prepare command for srclib %s" raise BuildException("Error running prepare command for srclib %s"
% name, p.stdout) % name, p.stdout)
remove_signing_keys(libdir)
if basepath: if basepath:
libdir = sdir libdir = sdir
@ -957,13 +969,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
'build.gradle'], cwd=gradle_dir) 'build.gradle'], cwd=gradle_dir)
# Remove forced debuggable flags # Remove forced debuggable flags
logging.info("Removing debuggable flags") remove_debuggable_flags(root_dir)
for path in manifest_paths(root_dir, flavour):
if not os.path.isfile(path):
continue
if subprocess.call(['sed','-i',
's/android:debuggable="[^"]*"//g', path]) != 0:
raise BuildException("Failed to remove debuggable flags")
# Insert version code and number into the manifest if necessary # Insert version code and number into the manifest if necessary
if build['forceversion']: if build['forceversion']: