Skip to content

Commit

Permalink
Squashed 'external/devlib/' changes from f60e341d6..c60737c78
Browse files Browse the repository at this point in the history
c60737c78 [Android] Fix use-before-initialization during initialization of ApkInfo

git-subtree-dir: external/devlib
git-subtree-split: c60737c78e00204ebfaf9708e80185084db2693c
  • Loading branch information
douglas-raillard-arm committed Jan 19, 2024
1 parent 4488e6b commit f387125
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions external/devlib/devlib/utils/android.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,12 +148,12 @@ def __init__(self, path=None):
self._apk_path = None
self._activities = None
self._methods = None
if path:
self.parse(path)

self._aapt = _ANDROID_ENV.get_env('aapt')
self._aapt_version = _ANDROID_ENV.get_env('aapt_version')

if path:
self.parse(path)

# pylint: disable=too-many-branches
def parse(self, apk_path):
output = self._run([self._aapt, 'dump', 'badging', apk_path])
Expand Down

0 comments on commit f387125

Please sign in to comment.