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

gn2bp: move jni_generator.py --jar_file to sanitizer

Browse Source 
Test: none
Change-Id: I2a602a3b11304c3c4c8fe551890c7c16c73455bf
This commit is contained in:
Patrick Rohr
2022-11-30 16:07:11 -08:00
parent 9f439321d8
commit fda02673e4
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/gn2bp/gen_android_bp
View File

@@ -684,7 +684,7 @@ class BaseActionSanitizer():
self.target.args.append(value) self.target.args.append(value)
# wrap filename in location tag. # wrap filename in location tag.
def _location_tag(self, filename): def _add_location_tag(self, filename):
return '$(location %s)' % filename return '$(location %s)' % filename
# applies common directory transformation that *should* be universally applicable. # applies common directory transformation that *should* be universally applicable.
@@ -712,6 +712,8 @@ class WriteBuildFlagHeaderSanitizer(BaseActionSanitizer):
class JniGeneratorSanitizer(BaseActionSanitizer): class JniGeneratorSanitizer(BaseActionSanitizer):
def get_args(self): def get_args(self):
self._update_value_arg('--jar_file', self._sanitize_dir)
self._update_value_arg('--jar_file', self._add_location_tag)
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)')
self._update_value_arg('--output_dir', self._sanitize_dir) self._update_value_arg('--output_dir', self._sanitize_dir)
@@ -782,10 +784,6 @@ def create_action_module(blueprint, target):
# TODO: put inside function # TODO: put inside function
filename = re.sub('^\.\./\.\./', '', target.args[i + 1]) filename = re.sub('^\.\./\.\./', '', target.args[i + 1])
target.args[i + 1] = '$(location %s)' % filename target.args[i + 1] = '$(location %s)' % filename
elif val == '--jar_file':
# delete leading ../../ and add path to javap
filename = re.sub('^\.\./\.\./', '', target.args[i + 1])
target.args[i + 1] = '$(location %s)' % filename
# fix target.output directory to match #include statements. # fix target.output directory to match #include statements.
target.outputs = [re.sub('^jni_headers/', '', out) for out in target.outputs] target.outputs = [re.sub('^jni_headers/', '', out) for out in target.outputs]