From 342b976d72ad8722a5579ccd41df5230fe7ddb02 Mon Sep 17 00:00:00 2001 From: hui1975 Date: Fri, 16 Dec 2022 14:42:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B0=86light=E7=9A=84first=5Fintroduced?= =?UTF-8?q?=E6=94=B9=E4=B8=BA10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: hui1975 Change-Id: I1dd19e449e6a3c1031041ab1c02fc5f964237fbc --- frameworks/native/miscdevice/BUILD.gn | 1 - interfaces/native/light/BUILD.gn | 16 ---------------- interfaces/native/light/liblight.json | 15 --------------- interfaces/native/vibrator/BUILD.gn | 16 ---------------- interfaces/native/vibrator/libvibrator.json | 18 ------------------ 5 files changed, 66 deletions(-) delete mode 100755 interfaces/native/light/liblight.json delete mode 100755 interfaces/native/vibrator/libvibrator.json diff --git a/frameworks/native/miscdevice/BUILD.gn b/frameworks/native/miscdevice/BUILD.gn index 89bc0ee..cc48981 100644 --- a/frameworks/native/miscdevice/BUILD.gn +++ b/frameworks/native/miscdevice/BUILD.gn @@ -32,7 +32,6 @@ ohos_shared_library("liblight_native") { ] cflags = [ "-fstack-protector-all" ] deps = [ - "$SUBSYSTEM_DIR/miscdevice/interfaces/native/light:light_ndk_header", "$SUBSYSTEM_DIR/miscdevice/utils:libmiscdevice_utils", ] diff --git a/interfaces/native/light/BUILD.gn b/interfaces/native/light/BUILD.gn index 985f8db..3eaa820 100755 --- a/interfaces/native/light/BUILD.gn +++ b/interfaces/native/light/BUILD.gn @@ -14,20 +14,6 @@ import("//build/ohos.gni") SUBSYSTEM_DIR = "//base/sensors/miscdevice" -ohos_ndk_library("liblight_ndk") { - output_name = "light_agent" - ndk_description_file = "./liblight.json" - min_compact_version = "7" -} - -ohos_ndk_headers("light_ndk_header") { - dest_dir = "$ndk_headers_out_dir/sensors" - sources = [ - "./include/light_agent.h", - "./include/light_agent_type.h", - ] -} - config("light_config") { include_dirs = [ "include" ] } @@ -48,8 +34,6 @@ ohos_shared_library("light_interface_native") { deps = [ "$SUBSYSTEM_DIR/frameworks/native/miscdevice:liblight_native", - "$SUBSYSTEM_DIR/interfaces/native/light:liblight_ndk", - "$SUBSYSTEM_DIR/interfaces/native/light:light_ndk_header", ] external_deps = [ diff --git a/interfaces/native/light/liblight.json b/interfaces/native/light/liblight.json deleted file mode 100755 index 969401a..0000000 --- a/interfaces/native/light/liblight.json +++ /dev/null @@ -1,15 +0,0 @@ -[ - { - "first_introduced": "7", - "name": "GetLightList" - }, - { - "name": "TurnOn" - }, - { - "name": "TurnOnMulti" - }, - { - "name": "TurnOff" - } - ] \ No newline at end of file diff --git a/interfaces/native/vibrator/BUILD.gn b/interfaces/native/vibrator/BUILD.gn index 4a58c2e..1cb3d30 100644 --- a/interfaces/native/vibrator/BUILD.gn +++ b/interfaces/native/vibrator/BUILD.gn @@ -14,20 +14,6 @@ import("//build/ohos.gni") SUBSYSTEM_DIR = "//base/sensors/miscdevice" -ohos_ndk_library("libvibrator_ndk") { - output_name = "vibrator_agent" - ndk_description_file = "./libvibrator.json" - min_compact_version = "6" -} - -ohos_ndk_headers("vibrator_ndk_header") { - dest_dir = "$ndk_headers_out_dir/sensors" - sources = [ - "./include/vibrator_agent.h", - "./include/vibrator_agent_type.h", - ] -} - config("vibrator_config") { include_dirs = [ "include" ] } @@ -49,8 +35,6 @@ ohos_shared_library("vibrator_interface_native") { deps = [ "$SUBSYSTEM_DIR/frameworks/native/miscdevice:libvibrator_native", - "$SUBSYSTEM_DIR/interfaces/native/light:light_ndk_header", - "$SUBSYSTEM_DIR/interfaces/native/vibrator:libvibrator_ndk", ] external_deps = [ diff --git a/interfaces/native/vibrator/libvibrator.json b/interfaces/native/vibrator/libvibrator.json deleted file mode 100755 index 376816e..0000000 --- a/interfaces/native/vibrator/libvibrator.json +++ /dev/null @@ -1,18 +0,0 @@ -[ - { - "first_introduced": "6", - "name": "StartVibrator" - }, - { - "name": "StartVibratorOnce" - }, - { - "name": "EnableLooping" - }, - { - "name": "DisableLooping" - }, - { - "name": "StopVibrator" - } -] -- Gitee From 531a8bef38f08490cf0c6b0383a567228dfff16e Mon Sep 17 00:00:00 2001 From: hui1975 Date: Tue, 20 Dec 2022 15:28:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96gn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: hui1975 Change-Id: I035b360e90c1c6c33249cc411463c1a0dcf25b7d --- frameworks/native/miscdevice/BUILD.gn | 4 +--- interfaces/native/light/BUILD.gn | 4 +--- interfaces/native/vibrator/BUILD.gn | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/frameworks/native/miscdevice/BUILD.gn b/frameworks/native/miscdevice/BUILD.gn index cc48981..2d925b3 100644 --- a/frameworks/native/miscdevice/BUILD.gn +++ b/frameworks/native/miscdevice/BUILD.gn @@ -31,9 +31,7 @@ ohos_shared_library("liblight_native") { "//utils/jni/jnikit/include", ] cflags = [ "-fstack-protector-all" ] - deps = [ - "$SUBSYSTEM_DIR/miscdevice/utils:libmiscdevice_utils", - ] + deps = [ "$SUBSYSTEM_DIR/miscdevice/utils:libmiscdevice_utils" ] external_deps = [ "c_utils:utils", diff --git a/interfaces/native/light/BUILD.gn b/interfaces/native/light/BUILD.gn index 3eaa820..392df14 100755 --- a/interfaces/native/light/BUILD.gn +++ b/interfaces/native/light/BUILD.gn @@ -32,9 +32,7 @@ ohos_shared_library("light_interface_native") { cflags = [ "-Wno-error=inconsistent-missing-override" ] - deps = [ - "$SUBSYSTEM_DIR/frameworks/native/miscdevice:liblight_native", - ] + deps = [ "$SUBSYSTEM_DIR/frameworks/native/miscdevice:liblight_native" ] external_deps = [ "c_utils:utils", diff --git a/interfaces/native/vibrator/BUILD.gn b/interfaces/native/vibrator/BUILD.gn index 1cb3d30..ea52159 100644 --- a/interfaces/native/vibrator/BUILD.gn +++ b/interfaces/native/vibrator/BUILD.gn @@ -33,9 +33,7 @@ ohos_shared_library("vibrator_interface_native") { cflags = [ "-Wno-error=inconsistent-missing-override" ] - deps = [ - "$SUBSYSTEM_DIR/frameworks/native/miscdevice:libvibrator_native", - ] + deps = [ "$SUBSYSTEM_DIR/frameworks/native/miscdevice:libvibrator_native" ] external_deps = [ "c_utils:utils", -- Gitee