From 40d111389899317823bce1570eb3417c89dc9cf2 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Sat, 22 Nov 2025 18:17:20 +0100
Subject: [PATCH] purge remove_debuggable_flags(), upstreams should handle this

Also, there might be valid use cases for using fdroidserver to build APKs
that are debuggable.  There are other checks to ensure that debuggable APKs
are not published, e.g. in `fdroid update`.

https://gitlab.com/fdroid/fdroidserver/-/blob/48df58854c3bb2b8e5bd3001c4c06ec872ff2205/fdroidserver/update.py#L1978
---
 fdroidserver/common.py                             | 14 --------------
 .../fdroid/fdroidclient/AndroidManifest.xml        |  1 -
 tests/test_common.py                               | 13 +++++--------
 3 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 9807f2b0..0282c5ca 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -2175,16 +2175,6 @@ def ant_subprojects(root_dir):
     return subprojects
 
 
-def remove_debuggable_flags(root_dir):
-    # Remove forced debuggable flags
-    logging.debug("Removing debuggable flags from %s" % root_dir)
-    for root, dirs, files in os.walk(root_dir):
-        if 'AndroidManifest.xml' in files and os.path.isfile(os.path.join(root, 'AndroidManifest.xml')):
-            regsub_file(r'android:debuggable="[^"]*"',
-                        '',
-                        os.path.join(root, 'AndroidManifest.xml'))
-
-
 vcsearch_g = re.compile(r'''\b[Vv]ersionCode\s*=?\s*["'(]*([0-9][0-9_]*)["')]*''').search
 vnsearch_g = re.compile(r'''\b[Vv]ersionName\s*=?\s*\(?(["'])((?:(?=(\\?))\3.)*?)\1''').search
 vnssearch_g = re.compile(r'''\b[Vv]ersionNameSuffix\s*=?\s*(["'])((?:(?=(\\?))\3.)*?)\1''').search
@@ -2551,7 +2541,6 @@ def getsrclib(spec, srclib_dir, basepath=False,
         libdir = sdir
 
     remove_signing_keys(sdir)
-    remove_debuggable_flags(sdir)
 
     if prepare:
 
@@ -2716,9 +2705,6 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
                         r'compileSdkVersion %s' % n,
                         gradlefile)
 
-    # Remove forced debuggable flags
-    remove_debuggable_flags(root_dir)
-
     # Insert versionCode and number into the manifest if necessary
     if build.forceversion:
         logging.info("Changing the versionName")
diff --git a/tests/source-files/fdroid/fdroidclient/AndroidManifest.xml b/tests/source-files/fdroid/fdroidclient/AndroidManifest.xml
index bd84256b..705ac8be 100644
--- a/tests/source-files/fdroid/fdroidclient/AndroidManifest.xml
+++ b/tests/source-files/fdroid/fdroidclient/AndroidManifest.xml
@@ -56,7 +56,6 @@
         tools:ignore="ProtectedPermissions"/>
 
     <application
-        android:debuggable="true"
         android:name="FDroidApp"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
diff --git a/tests/test_common.py b/tests/test_common.py
index fe26f420..e9ec8c6e 100755
--- a/tests/test_common.py
+++ b/tests/test_common.py
@@ -1835,19 +1835,16 @@ class CommonTest(SetUpTearDownMixin, unittest.TestCase):
 
         vcs = mock.Mock()
         skm = mock.Mock()
-        dfm = mock.Mock()
 
         with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
             os.makedirs(os.path.join('srclib', 'ACRA'))
             with mock.patch('fdroidserver.common.getvcs', return_value=vcs):
                 with mock.patch('fdroidserver.common.remove_signing_keys', skm):
-                    with mock.patch('fdroidserver.common.remove_debuggable_flags', dfm):
-                        ret = fdroidserver.common.getsrclib('ACRA@acra-4.6.2', 'srclib')
-                        self.assertEqual(vcs.srclib, ('ACRA', None, 'srclib/ACRA'))
-                        vcs.gotorevision.assert_called_once_with('acra-4.6.2', True)
-                        skm.assert_called_once_with('srclib/ACRA')
-                        dfm.assert_called_once_with('srclib/ACRA')
-                        self.assertEqual(ret, ('ACRA', None, 'srclib/ACRA'))
+                    ret = fdroidserver.common.getsrclib('ACRA@acra-4.6.2', 'srclib')
+                    self.assertEqual(vcs.srclib, ('ACRA', None, 'srclib/ACRA'))
+                    vcs.gotorevision.assert_called_once_with('acra-4.6.2', True)
+                    skm.assert_called_once_with('srclib/ACRA')
+                    self.assertEqual(ret, ('ACRA', None, 'srclib/ACRA'))
 
     def test_run_yamllint_wellformed(self):
         try: