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

gn2bp: Create java_genrule directly from create_action_module

Browse Source 
* Instead of going through creating `java_genrule` through `create_modules_from_target`. It's better to just create the genrules from `create_action_module` directly.

Test: update_results.sh
Change-Id: I35d1bf8854b5724390ea776c01e54452fcbaaba6
This commit is contained in:
Mohannad Farrag
2022-12-02 14:25:44 +00:00
parent 584613d745
commit 4b89a8275a
1 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tools/gn2bp/gen_android_bp
View File

@@ -1024,15 +1024,7 @@ def create_modules_from_target(blueprint, gn, gn_target_name):
if module is None:
return None
elif target.type == 'action':
if gn_utils.is_java_action(target.script, target.outputs) and \
target.name != "//components/cronet/android:cronet_jni_registration":
# This is a cc_genrule that generates both a c++ header file and
# srcjar for java. Treat it as a cc_genrule for the time being while
# making anothe deep copy of the module and append _java to it for
# the java_library.
module = create_action_module(blueprint, target, 'java_genrule')
else:
module = create_action_module(blueprint, target, 'cc_genrule')
module = create_action_module(blueprint, target, 'cc_genrule')
elif target.type == 'action_foreach':
module = create_action_foreach_modules(blueprint, target)
elif target.type == 'copy':
@@ -1212,12 +1204,7 @@ def create_java_module(blueprint, gn):
module = Module('java_library', bp_module_name, '//gn:java')
module.srcs.update([gn_utils.label_to_path(source) for source in gn.java_sources])
for dep in gn.java_actions:
dep_module = create_modules_from_target(blueprint, gn, dep)
if "cronet_jni_registration" in dep_module.name:
dep_module = copy.deepcopy(dep_module)
dep_module.name += "_java"
dep_module.type = 'java_genrule'
dep_module.out = [out for out in dep_module.out if out.endswith(".srcjar")]
dep_module = create_action_module(blueprint, gn.get_target(dep), 'java_genrule')
blueprint.add_module(module)
def update_jni_registration_module(module, gn):