diff --git a/frameworks/ets/taihe/power/BUILD.gn b/frameworks/ets/taihe/power/BUILD.gn index 03ac3d4c44189027917588ebdf521570aa23307f..4efed390893f2710b0b258cd2542237f2d2ada06 100644 --- a/frameworks/ets/taihe/power/BUILD.gn +++ b/frameworks/ets/taihe/power/BUILD.gn @@ -22,10 +22,11 @@ copy_taihe_idl("copy_power_manager") { subsystem_name = "powermgr" part_name = "power_manager" -taihe_generated_file_path = "$taihe_file_path/out/$subsystem_name/$part_name" +taihe_generated_file_path_power = + "$taihe_file_path/out/$subsystem_name/$part_name/power" ohos_taihe("run_taihe") { - taihe_generated_file_path = "$taihe_generated_file_path" + taihe_generated_file_path = "${taihe_generated_file_path_power}" deps = [ ":copy_power_manager" ] outputs = [ "$taihe_generated_file_path/src/ohos.power.ani.cpp", @@ -40,7 +41,7 @@ taihe_shared_library("power_manager_taihe_native") { cfi_cross_dso = true debug = false } - taihe_generated_file_path = "$taihe_generated_file_path" + taihe_generated_file_path = "${taihe_generated_file_path_power}" part_name = "$part_name" subsystem_name = "$subsystem_name" sources = get_target_outputs(":run_taihe") @@ -69,8 +70,8 @@ taihe_shared_library("power_manager_taihe_native") { } generate_static_abc("power_abc") { - base_url = "$taihe_generated_file_path" - files = [ "$taihe_generated_file_path/@ohos.power.ets" ] + base_url = "${taihe_generated_file_path_power}" + files = [ "${taihe_generated_file_path_power}/@ohos.power.ets" ] is_boot_abc = "True" device_dst_file = "/system/framework/power_abc.abc" dependencies = [ ":run_taihe" ] @@ -80,7 +81,7 @@ generate_static_abc("power_test") { base_url = "$powermgr_framework/ets/taihe/power/test" files = [ "$powermgr_framework/ets/taihe/power/test/test_main.ets", - "$powermgr_framework/ets/taihe/power/test/test_power.ets" + "$powermgr_framework/ets/taihe/power/test/test_power.ets", ] is_boot_abc = "True" device_dst_file = "/system/framework/power_test.abc" @@ -91,7 +92,5 @@ ohos_prebuilt_etc("power_abc_etc") { module_install_dir = "framework" part_name = "$part_name" subsystem_name = "$subsystem_name" - deps = [ - ":power_abc", - ] -} \ No newline at end of file + deps = [ ":power_abc" ] +} diff --git a/frameworks/ets/taihe/runninglock/BUILD.gn b/frameworks/ets/taihe/runninglock/BUILD.gn index 32dc23ab1d18f71569dc24cd1df72ddfa04ccf80..303916b958e7809020bd662f54c69819f05ca147 100644 --- a/frameworks/ets/taihe/runninglock/BUILD.gn +++ b/frameworks/ets/taihe/runninglock/BUILD.gn @@ -22,10 +22,11 @@ copy_taihe_idl("copy_power_manager_runninglock") { subsystem_name = "powermgr" part_name = "power_manager" -taihe_generated_file_path = "$taihe_file_path/out/$subsystem_name/$part_name" +taihe_generated_file_path_runningLock = + "$taihe_file_path/out/$subsystem_name/$part_name/runningLock" ohos_taihe("run_taihe") { - taihe_generated_file_path = "$taihe_generated_file_path" + taihe_generated_file_path = "${taihe_generated_file_path_runningLock}" deps = [ ":copy_power_manager_runninglock" ] outputs = [ "$taihe_generated_file_path/src/ohos.runningLock.ani.cpp", @@ -40,7 +41,7 @@ taihe_shared_library("power_manager_runninglock_taihe_native") { cfi_cross_dso = true debug = false } - taihe_generated_file_path = "$taihe_generated_file_path" + taihe_generated_file_path = "${taihe_generated_file_path_runningLock}" part_name = "$part_name" subsystem_name = "$subsystem_name" sources = get_target_outputs(":run_taihe") @@ -61,8 +62,8 @@ taihe_shared_library("power_manager_runninglock_taihe_native") { } generate_static_abc("runningLock_abc") { - base_url = "$taihe_generated_file_path" - files = [ "$taihe_generated_file_path/@ohos.runningLock.ets" ] + base_url = "${taihe_generated_file_path_runningLock}" + files = [ "${taihe_generated_file_path_runningLock}/@ohos.runningLock.ets" ] is_boot_abc = "True" device_dst_file = "/system/framework/runningLock_abc.abc" dependencies = [ ":run_taihe" ] @@ -81,4 +82,4 @@ ohos_prebuilt_etc("runningLock_etc") { part_name = "$part_name" subsystem_name = "$subsystem_name" deps = [ ":runningLock_abc" ] -} \ No newline at end of file +}