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

gn2bp: name helper functions more consistently

Browse Source 
Test: none
Change-Id: I84f14d804e206c638df4a61978601706e09c589a
This commit is contained in:
Patrick Rohr
2022-11-30 14:27:40 -08:00
parent ef4f2bf7e4
commit 2cad933ab6
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tools/gn2bp/gen_android_bp
View File

@@ -626,6 +626,12 @@ class BaseActionSanitizer():
# Convert ['--param=value'] to ['--param', 'value'] for consistency. # Convert ['--param=value'] to ['--param', 'value'] for consistency.
self.target.args = [str for it in self.target.args for str in it.split('=')] self.target.args = [str for it in self.target.args for str in it.split('=')]
# There are three types of args:
# - flags (--flag)
# - value args (--arg value)
# - list args (--arg value1 --arg value2)
# Some functions provide special implementations for each type, while others
# work on all of them.
def _has_arg(self, arg): def _has_arg(self, arg):
return arg in self.target.args return arg in self.target.args
@@ -640,12 +646,12 @@ class BaseActionSanitizer():
i = self.target.args.index(arg) i = self.target.args.index(arg)
return not self.target.args[i + 1].startswith('--') return not self.target.args[i + 1].startswith('--')
def _get_arg_value(self, arg): def _get_value_arg(self, arg):
assert(self._is_value_arg(arg)) assert(self._is_value_arg(arg))
i = self.target.args.index(arg) i = self.target.args.index(arg)
return self.target.args[i + 1] return self.target.args[i + 1]
def _set_arg_value(self, arg, value): def _set_value_arg(self, arg, value):
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
@@ -683,8 +689,8 @@ class WriteBuildDateHeaderSanitizer(BaseActionSanitizer):
class WriteBuildFlagHeaderSanitizer(BaseActionSanitizer): class WriteBuildFlagHeaderSanitizer(BaseActionSanitizer):
def get_args(self): def get_args(self):
self._set_arg_value('--gen-dir', '.') self._set_value_arg('--gen-dir', '.')
self._set_arg_value('--output', '$(out)') self._set_value_arg('--output', '$(out)')
return super().get_args() return super().get_args()
class JniGeneratorSanitizer(BaseActionSanitizer): class JniGeneratorSanitizer(BaseActionSanitizer):