diff --git a/external/devlib/devlib/target.py b/external/devlib/devlib/target.py index d466239fe889dc1d9799400b83190e94a55a78a9..56621864ba8fc04333bcaf61ecc908c67522089a 100644 --- a/external/devlib/devlib/target.py +++ b/external/devlib/devlib/target.py @@ -1183,7 +1183,7 @@ fi """ Returns the value of the given sysctl parameter as a string. """ - path = self.path.join('proc', 'sys', *parameter.split('.')) + path = self.path.join('/', 'proc', 'sys', *parameter.split('.')) try: return await self.read_value.asyn(path) except FileNotFoundError as e: diff --git a/external/devlib/devlib/utils/android.py b/external/devlib/devlib/utils/android.py index 62bd7e3682a05c3441f5dde2f1234d9028f919f9..3af15d8bb0cfd6c4545b94982244575b66210550 100755 --- a/external/devlib/devlib/utils/android.py +++ b/external/devlib/devlib/utils/android.py @@ -156,7 +156,7 @@ class ApkInfo(object): # pylint: disable=too-many-branches def parse(self, apk_path): - output = self._run([self.aapt, 'dump', 'badging', apk_path]) + output = self._run([self._aapt, 'dump', 'badging', apk_path]) for line in output.split('\n'): if line.startswith('application-label:'): self.label = line.split(':')[1].strip().replace('\'', '') @@ -196,7 +196,7 @@ class ApkInfo(object): @property def activities(self): if self._activities is None: - cmd = [self.aapt, 'dump', 'xmltree', self._apk_path] + cmd = [self._aapt, 'dump', 'xmltree', self._apk_path] if self._aapt_version == 2: cmd += ['--file'] cmd += ['AndroidManifest.xml'] @@ -215,7 +215,7 @@ class ApkInfo(object): extracted = z.extract('classes.dex', tmp_dir) except KeyError: return [] - dexdump = os.path.join(os.path.dirname(self.aapt), 'dexdump') + dexdump = os.path.join(os.path.dirname(self._aapt), 'dexdump') command = [dexdump, '-l', 'xml', extracted] dump = self._run(command)