gn2bp: Duplicate cronet_aml_java for testing
Test: None
Change-Id: Ib7cd19697ac39362cc67ad97e4c6bcf1c516e287
diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index 4c5a479..2760425 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -1615,8 +1615,10 @@
def get_api_java_actions(gn):
return get_java_actions(gn, lambda name: name == java_api_target_name)
-def create_java_module(blueprint, gn):
+def create_java_module(blueprint, gn, is_test_target):
bp_module_name = module_prefix + 'java'
+ if is_test_target:
+ bp_module_name += gn_utils.TESTING_SUFFIX
module = Module('java_library', bp_module_name, '//gn:java')
module.srcs.update([gn_utils.label_to_path(source) for source in get_non_api_java_sources(gn)])
module.libs = {
@@ -1643,13 +1645,14 @@
# would be less likely to conflict with upstream changes if the revert is not
# accepted.
module.javacflags.add("-Aorg.chromium.chrome.skipGenJni")
- module.javacflags.add("-Apackage_prefix=android.net.http.internal")
+ if not is_test_target:
+ module.javacflags.add("-Apackage_prefix=android.net.http.internal")
for dep in get_non_api_java_actions(gn):
target = gn.get_target(dep)
if target.script == '//build/android/gyp/gcc_preprocess.py':
module.srcs.add(':' + create_gcc_preprocess_modules(blueprint, target).name)
else:
- module.srcs.add(':' + create_action_module(blueprint, target, 'java_genrule', False).name)
+ module.srcs.add(':' + create_action_module(blueprint, target, 'java_genrule', is_test_target).name)
preprocessor_module = create_java_jni_preprocessor(blueprint)
module.plugins.add(preprocessor_module.name)
blueprint.add_module(module)
@@ -1734,8 +1737,10 @@
create_modules_from_target(blueprint, gn, test_target + gn_utils.TESTING_SUFFIX, is_test_target=True)
java_api_module = create_java_api_module(blueprint, gn)
- java_module = create_java_module(blueprint, gn)
+ java_module = create_java_module(blueprint, gn, is_test_target=False)
java_module.libs.add(java_api_module.name)
+ java_module_testing = create_java_module(blueprint, gn, is_test_target=True)
+ java_module_testing.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)