Skip to content

Commit

Permalink
external/devlib: update to latest master
Browse files Browse the repository at this point in the history
  • Loading branch information
douglas-raillard-arm committed Jan 16, 2024
2 parents a0c8236 + afdb569 commit 51783a3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion external/devlib/devlib/target.py
Original file line number Diff line number Diff line change
Expand Up @@ -1183,7 +1183,7 @@ async def read_sysctl(self, parameter):
"""
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:
Expand Down
6 changes: 3 additions & 3 deletions external/devlib/devlib/utils/android.py
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ def __init__(self, path=None):

# 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('\'', '')
Expand Down Expand Up @@ -196,7 +196,7 @@ def parse(self, apk_path):
@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']
Expand All @@ -215,7 +215,7 @@ def methods(self):
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)

Expand Down

0 comments on commit 51783a3

Please sign in to comment.