diff --git a/frameworks/ets/gesture_event/BUILD.gn b/frameworks/ets/gesture_event/BUILD.gn index b23dca816112c46a17cacfa59ee2acb47f760628..adfde9751bca7faec30bfa240af85547042026ef 100644 --- a/frameworks/ets/gesture_event/BUILD.gn +++ b/frameworks/ets/gesture_event/BUILD.gn @@ -29,9 +29,9 @@ config("gestureEvent_config") { } subsystem_name = "multimodalinput" part_name = "input" -taihe_generated_file_path = "$taihe_file_path/out/$subsystem_name/$part_name" +taihe_generated_file_path_gestureEvent = "$taihe_file_path/out/$subsystem_name/$part_name/gestureEvent" ohos_taihe("run_taihe") { - taihe_generated_file_path = "$taihe_generated_file_path" + taihe_generated_file_path = "${taihe_generated_file_path_gestureEvent}" deps = [ ":gesture_event_taihe" ] outputs = [ "$taihe_generated_file_path/src/ohos.multimodalInput.gestureEvent.ani.cpp", @@ -39,7 +39,7 @@ ohos_taihe("run_taihe") { ] } taihe_shared_library("GestureEvent") { - taihe_generated_file_path = "$taihe_generated_file_path" + taihe_generated_file_path = "${taihe_generated_file_path_gestureEvent}" part_name = "$part_name" subsystem_name = "$subsystem_name" sources = get_target_outputs(":run_taihe") @@ -71,8 +71,8 @@ taihe_shared_library("GestureEvent") { } } generate_static_abc("crypto_framework_abc") { - base_url = "$taihe_generated_file_path" - files = [ "$taihe_generated_file_path/@ohos.multimodalInput.gestureEvent.ets" ] + base_url = "${taihe_generated_file_path_gestureEvent}" + files = [ "${taihe_generated_file_path_gestureEvent}/@ohos.multimodalInput.gestureEvent.ets" ] is_boot_abc = "True" device_dst_file = "/system/framework/crypto_framework_abc.abc" dependencies = [ ":run_taihe" ] diff --git a/frameworks/ets/input_consumer/BUILD.gn b/frameworks/ets/input_consumer/BUILD.gn index 93d1abc7c29628d109b5d72ef444f0c2304258fe..3a8297389b0312ab11f805a01d08e126c9e73b55 100644 --- a/frameworks/ets/input_consumer/BUILD.gn +++ b/frameworks/ets/input_consumer/BUILD.gn @@ -28,9 +28,9 @@ config("inputConsumer_config") { } subsystem_name = "multimodalinput" part_name = "input" -taihe_generated_file_path = "$taihe_file_path/out/$subsystem_name/$part_name" +taihe_generated_file_path_inputConsumer = "$taihe_file_path/out/$subsystem_name/$part_name/inputConsumer" ohos_taihe("run_taihe") { - taihe_generated_file_path = "$taihe_generated_file_path" + taihe_generated_file_path = "${taihe_generated_file_path_inputConsumer}" deps = [ ":input_consumer_taihe" ] outputs = [ "$taihe_generated_file_path/src/ohos.multimodalInput.inputConsumer.ani.cpp", @@ -38,7 +38,7 @@ ohos_taihe("run_taihe") { ] } taihe_shared_library("InputConsumer") { - taihe_generated_file_path = "$taihe_generated_file_path" + taihe_generated_file_path = "${taihe_generated_file_path_inputConsumer}" part_name = "$part_name" subsystem_name = "$subsystem_name" sources = get_target_outputs(":run_taihe") @@ -70,8 +70,8 @@ taihe_shared_library("InputConsumer") { } } generate_static_abc("crypto_framework_abc") { - base_url = "$taihe_generated_file_path" - files = [ "$taihe_generated_file_path/@ohos.multimodalInput.inputConsumer.ets" ] + base_url = "${taihe_generated_file_path_inputConsumer}" + files = [ "${taihe_generated_file_path_inputConsumer}/@ohos.multimodalInput.inputConsumer.ets" ] is_boot_abc = "True" device_dst_file = "/system/framework/crypto_framework_abc.abc" dependencies = [ ":run_taihe" ] diff --git a/frameworks/ets/input_event/BUILD.gn b/frameworks/ets/input_event/BUILD.gn index c3ec660a5cd8d969b262274f2d129dba06265e59..6f1b1a53fb0e89191c78b982332f31a8658c10d2 100644 --- a/frameworks/ets/input_event/BUILD.gn +++ b/frameworks/ets/input_event/BUILD.gn @@ -18,9 +18,9 @@ copy_taihe_idl("input_event_taihe") { } subsystem_name = "multimodalinput" part_name = "input" -taihe_generated_file_path = "$taihe_file_path/out/subsystem_name/$part_name" +taihe_generated_file_path_inputEvent = "$taihe_file_path/out/$subsystem_name/$part_name/inputEvent" ohos_taihe("run_taihe") { - taihe_generated_file_path = "$taihe_generated_file_path" + taihe_generated_file_path = "${taihe_generated_file_path_inputEvent}" deps = [ ":input_event_taihe" ] outputs = [ "$taihe_generated_file_path/src/ohos.multimodalInput.inputEvent.ani.cpp", @@ -28,8 +28,8 @@ ohos_taihe("run_taihe") { ] } generate_static_abc("crypto_framework_abc") { - base_url = "$taihe_generated_file_path" - files = [ "$taihe_generated_file_path/@ohos.multimodalInput.inputEvent.ets" ] + base_url = "${taihe_generated_file_path_inputEvent}" + files = [ "${taihe_generated_file_path_inputEvent}/@ohos.multimodalInput.inputEvent.ets" ] is_boot_abc = "True" device_dst_file = "/system/framework/crypto_framework_abc.abc" dependencies = [ ":run_taihe" ] diff --git a/frameworks/ets/input_moniter/BUILD.gn b/frameworks/ets/input_moniter/BUILD.gn index 3f4197a4a8e92e2a6fdc92ce10844357f84ce89b..b1141b079e10036bf75513797bcc951bd60c0a05 100644 --- a/frameworks/ets/input_moniter/BUILD.gn +++ b/frameworks/ets/input_moniter/BUILD.gn @@ -35,9 +35,9 @@ config("inputMoniter_config") { } subsystem_name = "multimodalinput" part_name = "input" -taihe_generated_file_path = "$taihe_file_path/out/$subsystem_name/$part_name" +taihe_generated_file_path_inputMoniter = "$taihe_file_path/out/$subsystem_name/$part_name/inputMoniter" ohos_taihe("run_taihe") { - taihe_generated_file_path = "$taihe_generated_file_path" + taihe_generated_file_path = "${taihe_generated_file_path_inputMoniter}" deps = [ ":input_moniter_taihe" ] outputs = [ "$taihe_generated_file_path/src/ohos.multimodalInput.inputMoniter.ani.cpp", @@ -45,7 +45,7 @@ ohos_taihe("run_taihe") { ] } taihe_shared_library("InputMoniter") { - taihe_generated_file_path = "$taihe_generated_file_path" + taihe_generated_file_path = "${taihe_generated_file_path_inputMoniter}" part_name = "$part_name" subsystem_name = "$subsystem_name" sources = get_target_outputs(":run_taihe") @@ -77,8 +77,8 @@ taihe_shared_library("InputMoniter") { } } generate_static_abc("crypto_framework_abc") { - base_url = "$taihe_generated_file_path" - files = [ "$taihe_generated_file_path/@ohos.multimodalInput.inputMoniter.ets" ] + base_url = "${taihe_generated_file_path_inputMoniter}" + files = [ "${taihe_generated_file_path_inputMoniter}/@ohos.multimodalInput.inputMoniter.ets" ] is_boot_abc = "True" device_dst_file = "/system/framework/crypto_framework_abc.abc" dependencies = [ ":run_taihe" ] diff --git a/frameworks/ets/intention_code/BUILD.gn b/frameworks/ets/intention_code/BUILD.gn index 23bbbad2be7c9108d289123d09985c7d9a4f0188..498775053968da0241ec85240a6a759b7ed52712 100644 --- a/frameworks/ets/intention_code/BUILD.gn +++ b/frameworks/ets/intention_code/BUILD.gn @@ -28,9 +28,9 @@ config("intentionCode_config") { } subsystem_name = "multimodalinput" part_name = "input" -taihe_generated_file_path = "$taihe_file_path/out/$subsystem_name/$part_name" +taihe_generated_file_path_intentionCode = "$taihe_file_path/out/$subsystem_name/$part_name/intentionCode" ohos_taihe("run_taihe") { - taihe_generated_file_path = "$taihe_generated_file_path" + taihe_generated_file_path = "${taihe_generated_file_path_intentionCode}" deps = [ ":intention_code_taihe" ] outputs = [ "$taihe_generated_file_path/src/ohos.multimodalInput.intentionCode.ani.cpp", @@ -38,7 +38,7 @@ ohos_taihe("run_taihe") { ] } taihe_shared_library("IntentionCode") { - taihe_generated_file_path = "$taihe_generated_file_path" + taihe_generated_file_path = "${taihe_generated_file_path_intentionCode}" part_name = "$part_name" subsystem_name = "$subsystem_name" sources = get_target_outputs(":run_taihe") @@ -70,8 +70,8 @@ taihe_shared_library("IntentionCode") { } } generate_static_abc("crypto_framework_abc") { - base_url = "$taihe_generated_file_path" - files = [ "$taihe_generated_file_path/@ohos.multimodalInput.intentionCode.ets" ] + base_url = "${taihe_generated_file_path_intentionCode}" + files = [ "${taihe_generated_file_path_intentionCode}/@ohos.multimodalInput.intentionCode.ets" ] is_boot_abc = "True" device_dst_file = "/system/framework/crypto_framework_abc.abc" dependencies = [ ":run_taihe" ] diff --git a/frameworks/ets/key_code/BUILD.gn b/frameworks/ets/key_code/BUILD.gn index 37108a3f9c43c82bf246fd089e0e17ecb7d2df77..1e8ed4e89cafba19b13ecd517dd1e5fc4d539dbe 100644 --- a/frameworks/ets/key_code/BUILD.gn +++ b/frameworks/ets/key_code/BUILD.gn @@ -29,9 +29,9 @@ config("keyCode_config") { } subsystem_name = "multimodalinput" part_name = "input" -taihe_generated_file_path = "$taihe_file_path/out/$subsystem_name/$part_name" +taihe_generated_file_path_keyCode = "$taihe_file_path/out/$subsystem_name/$part_name/keyCode" ohos_taihe("run_taihe") { - taihe_generated_file_path = "$taihe_generated_file_path" + taihe_generated_file_path = "${taihe_generated_file_path_keyCode}" deps = [ ":key_code_taihe" ] outputs = [ "$taihe_generated_file_path/src/ohos.multimodalInput.keyCode.ani.cpp", @@ -39,7 +39,7 @@ ohos_taihe("run_taihe") { ] } taihe_shared_library("KeyCode") { - taihe_generated_file_path = "$taihe_generated_file_path" + taihe_generated_file_path = "${taihe_generated_file_path_keyCode}" part_name = "$part_name" subsystem_name = "$subsystem_name" sources = get_target_outputs(":run_taihe") @@ -71,8 +71,8 @@ taihe_shared_library("KeyCode") { } } generate_static_abc("crypto_framework_abc") { - base_url = "$taihe_generated_file_path" - files = [ "$taihe_generated_file_path/@ohos.multimodalInput.keyCode.ets" ] + base_url = "${taihe_generated_file_path_keyCode}" + files = [ "${taihe_generated_file_path_keyCode}/@ohos.multimodalInput.keyCode.ets" ] is_boot_abc = "True" device_dst_file = "/system/framework/crypto_framework_abc.abc" dependencies = [ ":run_taihe" ] diff --git a/frameworks/ets/key_event/BUILD.gn b/frameworks/ets/key_event/BUILD.gn index cd75bf3a6148df30edb2aeb8fb868072aa8181d2..8db217e548e736912a8bb55635d7295e59792466 100644 --- a/frameworks/ets/key_event/BUILD.gn +++ b/frameworks/ets/key_event/BUILD.gn @@ -32,9 +32,9 @@ config("keyEvent_config") { } subsystem_name = "multimodalinput" part_name = "input" -taihe_generated_file_path = "$taihe_file_path/out/$subsystem_name/$part_name" +taihe_generated_file_path_keyEvent = "$taihe_file_path/out/$subsystem_name/$part_name/keyEvent" ohos_taihe("run_taihe") { - taihe_generated_file_path = "$taihe_generated_file_path" + taihe_generated_file_path = "${taihe_generated_file_path_keyEvent}" deps = [ ":key_event_taihe" ] outputs = [ "$taihe_generated_file_path/src/ohos.multimodalInput.keyEvent.ani.cpp", @@ -42,7 +42,7 @@ ohos_taihe("run_taihe") { ] } taihe_shared_library("KeyEvent") { - taihe_generated_file_path = "$taihe_generated_file_path" + taihe_generated_file_path = "${taihe_generated_file_path_keyEvent}" part_name = "$part_name" subsystem_name = "$subsystem_name" sources = get_target_outputs(":run_taihe") @@ -74,8 +74,8 @@ taihe_shared_library("KeyEvent") { } } generate_static_abc("crypto_framework_abc") { - base_url = "$taihe_generated_file_path" - files = [ "$taihe_generated_file_path/@ohos.multimodalInput.keyEvent.ets" ] + base_url = "${taihe_generated_file_path_keyEvent}" + files = [ "${taihe_generated_file_path_keyEvent}/@ohos.multimodalInput.keyEvent.ets" ] is_boot_abc = "True" device_dst_file = "/system/framework/crypto_framework_abc.abc" dependencies = [ ":run_taihe" ] diff --git a/frameworks/ets/mouse_event/BUILD.gn b/frameworks/ets/mouse_event/BUILD.gn index 451151611cf9d2737c0cbb3d0d69270cb03574a2..8fa50f87312eab05bd1ba93a388f1a0949569407 100644 --- a/frameworks/ets/mouse_event/BUILD.gn +++ b/frameworks/ets/mouse_event/BUILD.gn @@ -27,9 +27,9 @@ config("mouseEvent_config") { } subsystem_name = "multimodalinput" part_name = "input" -taihe_generated_file_path = "$taihe_file_path/out/$subsystem_name/$part_name" +taihe_generated_file_path_mouseEvent = "$taihe_file_path/out/$subsystem_name/$part_name/mouseEvent" ohos_taihe("run_taihe") { - taihe_generated_file_path = "$taihe_generated_file_path" + taihe_generated_file_path = "${taihe_generated_file_path_mouseEvent}" deps = [ ":mouse_event_taihe" ] outputs = [ "$taihe_generated_file_path/src/ohos.multimodalInput.mouseEvent.ani.cpp", @@ -37,7 +37,7 @@ ohos_taihe("run_taihe") { ] } taihe_shared_library("MouseEvent") { - taihe_generated_file_path = "$taihe_generated_file_path" + taihe_generated_file_path = "${taihe_generated_file_path_mouseEvent}" part_name = "$part_name" subsystem_name = "$subsystem_name" sources = get_target_outputs(":run_taihe") @@ -69,8 +69,8 @@ taihe_shared_library("MouseEvent") { } } generate_static_abc("crypto_framework_abc") { - base_url = "$taihe_generated_file_path" - files = [ "$taihe_generated_file_path/@ohos.multimodalInput.mouseEvent.ets" ] + base_url = "${taihe_generated_file_path_mouseEvent}" + files = [ "${taihe_generated_file_path_mouseEvent}/@ohos.multimodalInput.mouseEvent.ets" ] is_boot_abc = "True" device_dst_file = "/system/framework/crypto_framework_abc.abc" dependencies = [ ":run_taihe" ] diff --git a/frameworks/ets/short_key/BUILD.gn b/frameworks/ets/short_key/BUILD.gn index 992a83064f063f4e7b94029c502c4a6de9443b37..9919e257d1750b875639962ec39f97a03d2e71bf 100644 --- a/frameworks/ets/short_key/BUILD.gn +++ b/frameworks/ets/short_key/BUILD.gn @@ -26,9 +26,9 @@ config("shortKey_config") { } subsystem_name = "multimodalinput" part_name = "input" -taihe_generated_file_path = "$taihe_file_path/out/$subsystem_name/$part_name" +taihe_generated_file_path_shortKey = "$taihe_file_path/out/$subsystem_name/$part_name/shortKey" ohos_taihe("run_taihe") { - taihe_generated_file_path = "$taihe_generated_file_path" + taihe_generated_file_path = "${taihe_generated_file_path_shortKey}" deps = [ ":short_key_taihe" ] outputs = [ "$taihe_generated_file_path/src/ohos.multimodalInput.shortKey.ani.cpp", @@ -36,7 +36,7 @@ ohos_taihe("run_taihe") { ] } taihe_shared_library("ShortKey") { - taihe_generated_file_path = "$taihe_generated_file_path" + taihe_generated_file_path = "${taihe_generated_file_path_shortKey}" part_name = "$part_name" subsystem_name = "$subsystem_name" sources = get_target_outputs(":run_taihe") @@ -68,8 +68,8 @@ taihe_shared_library("ShortKey") { } } generate_static_abc("crypto_framework_abc") { - base_url = "$taihe_generated_file_path" - files = [ "$taihe_generated_file_path/@ohos.multimodalInput.shortKey.ets" ] + base_url = "${taihe_generated_file_path_shortKey}" + files = [ "${taihe_generated_file_path_shortKey}/@ohos.multimodalInput.shortKey.ets" ] is_boot_abc = "True" device_dst_file = "/system/framework/crypto_framework_abc.abc" dependencies = [ ":run_taihe" ] diff --git a/frameworks/ets/touch_event/BUILD.gn b/frameworks/ets/touch_event/BUILD.gn index 7ebdfb3f731244f401cef0900eed498117dae821..5a2b1b3f64c419207667d92dc7370bea7dfb7201 100644 --- a/frameworks/ets/touch_event/BUILD.gn +++ b/frameworks/ets/touch_event/BUILD.gn @@ -27,9 +27,9 @@ config("touchEvent_config") { } subsystem_name = "multimodalinput" part_name = "input" -taihe_generated_file_path = "$taihe_file_path/out/$subsystem_name/$part_name" +taihe_generated_file_path_touchEvent = "$taihe_file_path/out/$subsystem_name/$part_name/touchEvent" ohos_taihe("run_taihe") { - taihe_generated_file_path = "$taihe_generated_file_path" + taihe_generated_file_path = "${taihe_generated_file_path_touchEvent}" deps = [ ":touch_event_taihe" ] outputs = [ "$taihe_generated_file_path/src/ohos.multimodalInput.touchEvent.ani.cpp", @@ -37,7 +37,7 @@ ohos_taihe("run_taihe") { ] } taihe_shared_library("TouchEvent") { - taihe_generated_file_path = "$taihe_generated_file_path" + taihe_generated_file_path = "${taihe_generated_file_path_touchEvent}" part_name = "$part_name" subsystem_name = "$subsystem_name" sources = get_target_outputs(":run_taihe") @@ -69,8 +69,8 @@ taihe_shared_library("TouchEvent") { } } generate_static_abc("crypto_framework_abc") { - base_url = "$taihe_generated_file_path" - files = [ "$taihe_generated_file_path/@ohos.multimodalInput.touchEvent.ets" ] + base_url = "${taihe_generated_file_path_touchEvent}" + files = [ "${taihe_generated_file_path_touchEvent}/@ohos.multimodalInput.touchEvent.ets" ] is_boot_abc = "True" device_dst_file = "/system/framework/crypto_framework_abc.abc" dependencies = [ ":run_taihe" ]