gn2bp: Add cronet_aml_api_java to cronet_aml_java lib
Test: ./update_results.sh
Change-Id: I02fb762d2a4af0fe5b200a9aafc6dee33d3eaed0
diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index a93bf84..6dc2901 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -1543,6 +1543,7 @@
preprocessor_module = create_java_jni_preprocessor(blueprint)
module.plugins.add(preprocessor_module.name)
blueprint.add_module(module)
+ return module
def create_java_api_module(blueprint, gn):
source_module = Module('filegroup', module_prefix + 'api_sources', java_api_target_name)
@@ -1553,6 +1554,15 @@
for dep in get_api_java_actions(gn)])
blueprint.add_module(source_module)
+ java_module = Module('java_library', module_prefix + 'api_java', java_api_target_name)
+ java_module.srcs.add(":" + source_module.name)
+ java_module.sdk_version = "module_current"
+ java_module.libs = {
+ "androidx.annotation_annotation",
+ }
+ blueprint.add_module(java_module)
+ return java_module
+
def update_jni_registration_module(module, gn):
# TODO: java_sources might not contain all the required java files
module.srcs.update([gn_utils.label_to_path(source)
@@ -1604,8 +1614,9 @@
for target in targets:
create_modules_from_target(blueprint, gn, target)
- create_java_api_module(blueprint, gn)
- create_java_module(blueprint, gn)
+ java_api_module = create_java_api_module(blueprint, gn)
+ java_module = create_java_module(blueprint, gn)
+ java_module.libs.add(java_api_module.name)
for module in blueprint.modules.values():
if 'cronet_jni_registration' in module.name:
update_jni_registration_module(module, gn)