From 2a892d2eb8f2723ba70a0832328a6c6599a94da7 Mon Sep 17 00:00:00 2001 From: Motomu Utsumi Date: Thu, 10 Nov 2022 18:03:20 +0900 Subject: [PATCH] gn2bp: Replace invalid #define for jni_registration_generator.py Test: m cronet_aml_components_cronet_android_cronet Change-Id: Ie73be657a9ffec86a554ce793f7ca390ce3775a2 --- tools/gn2bp/Android.bp.swp | 4 +++- tools/gn2bp/gen_android_bp | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp index 77debfed1d..228ac6895f 100644 --- a/tools/gn2bp/Android.bp.swp +++ b/tools/gn2bp/Android.bp.swp @@ -1981,7 +1981,9 @@ genrule { "$(genDir)/components/cronet/android/cronet_jni_registration.h " + "--manual_jni_registration " + " " + - "", + " " + + ";sed -i -e 's/OUT_SOONG_.TEMP/OUT_SOONG_DOTTEMP/g' " + + "$(genDir)/components/cronet/android/cronet_jni_registration.h", out: [ "components/cronet/android/cronet_jni_registration.h", "components/cronet/android/cronet_jni_registration.srcjar", diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp index 17b5bef98e..46b461bf24 100755 --- a/tools/gn2bp/gen_android_bp +++ b/tools/gn2bp/gen_android_bp @@ -1005,6 +1005,11 @@ def create_action_module(blueprint, target): "echo \\\"../$$current_dir/$$f\\\" >> $(genDir)/java.sources;", "done;", module.cmd] + + # .h file jni_registration_generator.py generates has #define with directory name. + # With the genrule env that contains "." which is invalid. So replace that at the end of cmd. + commands.append(";sed -i -e 's/OUT_SOONG_.TEMP/OUT_SOONG_DOTTEMP/g' ") + commands.append("$(genDir)/components/cronet/android/cronet_jni_registration.h") module.cmd = NEWLINE.join(commands) blueprint.add_module(module)