LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gn2bp: some functions should fail silently

Browse Source 
It is helpful to have certain functions that deal with target.args fail
silently if the arg does not exist. This eliminates the need to
specifically check for the arg's existence.

Test: none
Change-Id: Ia424a25d0b910c9c0de73d3cefbae21cce598ca9
This commit is contained in:
Patrick Rohr
2022-11-30 15:42:16 -08:00
parent 3e374ef0f2
commit 4d74aedfb0
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/gn2bp/gen_android_bp
View File

@@ -652,17 +652,26 @@ class BaseActionSanitizer():
return self.target.args[i + 1] return self.target.args[i + 1]
def _set_value_arg(self, arg, value): def _set_value_arg(self, arg, value):
# Fail silently
if not self._has_arg(arg):
return
assert(self._is_value_arg(arg)) assert(self._is_value_arg(arg))
i = self.target.args.index(arg) i = self.target.args.index(arg)
self.target.args[i + 1] = value self.target.args[i + 1] = value
def _update_value_arg(self, arg, func): def _update_value_arg(self, arg, func):
# Fail silently
if not self._has_arg(arg):
return
self._set_value_arg(arg, func(self._get_value_arg(arg))) self._set_value_arg(arg, func(self._get_value_arg(arg)))
def _set_arg_at(self, position, value): def _set_arg_at(self, position, value):
self.target.args[position] = value self.target.args[position] = value
def _delete_arg(self, arg): def _delete_arg(self, arg):
# Fail silently
if not self._has_arg(arg):
return
assert(not self._is_list_arg(arg)) assert(not self._is_list_arg(arg))
hasValue = self._is_value_arg(arg) hasValue = self._is_value_arg(arg)
i = self.target.index(arg) i = self.target.index(arg)
@@ -705,7 +714,6 @@ class JniGeneratorSanitizer(BaseActionSanitizer):
def get_args(self): def get_args(self):
if self._has_arg('--jar_file'): if self._has_arg('--jar_file'):
self._append_arg('--javap', '$$(find out/.path -name javap)') self._append_arg('--javap', '$$(find out/.path -name javap)')
if self._has_arg('--output_dir'):
self._update_value_arg('--output_dir', self._sanitize_dir) self._update_value_arg('--output_dir', self._sanitize_dir)
return super().get_args() return super().get_args()