From 5f4a1af4b4916bf4e08312be3de01abd222e6a81 Mon Sep 17 00:00:00 2001 From: hui1975 Date: Mon, 19 Dec 2022 14:08:46 +0800 Subject: [PATCH 1/2] delete libsensor.json Signed-off-by: hui1975 Change-Id: I2e1cb38c7aafcb9e534717fa202b127fe4d69186 --- interfaces/native/BUILD.gn | 7 ------- interfaces/native/libsensor.json | 24 ------------------------ 2 files changed, 31 deletions(-) delete mode 100755 interfaces/native/libsensor.json diff --git a/interfaces/native/BUILD.gn b/interfaces/native/BUILD.gn index 1050549d..be1a46ca 100644 --- a/interfaces/native/BUILD.gn +++ b/interfaces/native/BUILD.gn @@ -16,12 +16,6 @@ import("//build/ohos.gni") SUBSYSTEM_DIR = "//base/sensors/sensor" ############################################## -ohos_ndk_library("libsensor_ndk") { - output_name = "sensor" - ndk_description_file = "./libsensor.json" - min_compact_version = "6" -} - config("sensor_private_config") { include_dirs = [ "//commonlibrary/c_utils/base/include", @@ -51,7 +45,6 @@ ohos_shared_library("sensor_interface_native") { deps = [ "$SUBSYSTEM_DIR/frameworks/native/sensor:libsensor_native", - "$SUBSYSTEM_DIR/interfaces/native:libsensor_ndk", ] external_deps = [ diff --git a/interfaces/native/libsensor.json b/interfaces/native/libsensor.json deleted file mode 100755 index e2d65c4f..00000000 --- a/interfaces/native/libsensor.json +++ /dev/null @@ -1,24 +0,0 @@ -[ - { - "first_introduced": "6", - "name": "GetAllSensors" - }, - { - "name": "SubscribeSensor" - }, - { - "name": "UnsubscribeSensor" - }, - { - "name": "SetBatch" - }, - { - "name": "ActivateSensor" - }, - { - "name": "DeactivateSensor" - }, - { - "name": "SetMode" - } -] \ No newline at end of file -- Gitee From c5cb64d4a3c02ed24c819b2e41c089d7cbef9216 Mon Sep 17 00:00:00 2001 From: hui1975 Date: Tue, 20 Dec 2022 15:32:36 +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: If06f264a4ff440a44d6c52023d01cd7b96919373 --- interfaces/native/BUILD.gn | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/interfaces/native/BUILD.gn b/interfaces/native/BUILD.gn index be1a46ca..a14f3c5f 100644 --- a/interfaces/native/BUILD.gn +++ b/interfaces/native/BUILD.gn @@ -43,9 +43,7 @@ ohos_shared_library("sensor_interface_native") { configs = [ ":sensor_private_config" ] public_configs = [ ":sensor_public_config" ] - deps = [ - "$SUBSYSTEM_DIR/frameworks/native/sensor:libsensor_native", - ] + deps = [ "$SUBSYSTEM_DIR/frameworks/native/sensor:libsensor_native" ] external_deps = [ "c_utils:utils", -- Gitee