From 118c1faae6ad2e8cb9935a5b04451fafe2f3cc10 Mon Sep 17 00:00:00 2001 From: yue Date: Fri, 25 Feb 2022 17:38:19 +0800 Subject: [PATCH] modify compilation of HDI Signed-off-by: yue --- battery/v1_0/BUILD.gn | 2 -- battery/v1_0/IBatteryCallback.idl | 4 ++-- battery/v1_0/IBatteryInterface.idl | 6 +++--- battery/v1_0/Types.idl | 2 +- light/v1_0/BUILD.gn | 2 -- light/v1_0/ILightInterface.idl | 4 ++-- light/v1_0/LightTypes.idl | 2 +- power/v1_0/BUILD.gn | 2 -- power/v1_0/IPowerHdiCallback.idl | 2 +- power/v1_0/IPowerInterface.idl | 6 +++--- power/v1_0/PowerTypes.idl | 2 +- sensor/v1_0/BUILD.gn | 2 -- sensor/v1_0/ISensorCallback.idl | 4 ++-- sensor/v1_0/ISensorInterface.idl | 6 +++--- sensor/v1_0/SensorTypes.idl | 2 +- thermal/v1_0/BUILD.gn | 2 -- thermal/v1_0/IThermalCallback.idl | 4 ++-- thermal/v1_0/IThermalInterface.idl | 6 +++--- thermal/v1_0/ThermalTypes.idl | 2 +- vibrator/v1_0/BUILD.gn | 2 -- vibrator/v1_0/IVibratorInterface.idl | 4 ++-- vibrator/v1_0/VibratorTypes.idl | 2 +- 22 files changed, 29 insertions(+), 41 deletions(-) diff --git a/battery/v1_0/BUILD.gn b/battery/v1_0/BUILD.gn index d9d97019..bd7d764a 100755 --- a/battery/v1_0/BUILD.gn +++ b/battery/v1_0/BUILD.gn @@ -19,8 +19,6 @@ if (defined(ohos_lite)) { } } else { hdi("battery") { - package = "OHOS.HDI.battery.v1_0" - module_name = "battery_interface_service" sources = [ diff --git a/battery/v1_0/IBatteryCallback.idl b/battery/v1_0/IBatteryCallback.idl index 02b736e3..75469736 100755 --- a/battery/v1_0/IBatteryCallback.idl +++ b/battery/v1_0/IBatteryCallback.idl @@ -13,9 +13,9 @@ * limitations under the License. */ -package OHOS.HDI.battery.v1_0; +package ohos.hdi.battery.v1_0; -import OHOS.HDI.battery.v1_0.Types; +import ohos.hdi.battery.v1_0.Types; [callback] interface IBatteryCallback { Update([in] struct CallbackInfo event); diff --git a/battery/v1_0/IBatteryInterface.idl b/battery/v1_0/IBatteryInterface.idl index 46bd03d4..684ef2df 100755 --- a/battery/v1_0/IBatteryInterface.idl +++ b/battery/v1_0/IBatteryInterface.idl @@ -13,10 +13,10 @@ * limitations under the License. */ -package OHOS.HDI.battery.v1_0; +package ohos.hdi.battery.v1_0; -import OHOS.HDI.battery.v1_0.Types; -import OHOS.HDI.battery.v1_0.IBatteryCallback; +import ohos.hdi.battery.v1_0.Types; +import ohos.hdi.battery.v1_0.IBatteryCallback; interface IBatteryInterface { Register([in] IBatteryCallback event); diff --git a/battery/v1_0/Types.idl b/battery/v1_0/Types.idl index fcf756e7..39b9b6f5 100755 --- a/battery/v1_0/Types.idl +++ b/battery/v1_0/Types.idl @@ -13,7 +13,7 @@ * limitations under the License. */ -package OHOS.HDI.battery.v1_0; +package ohos.hdi.battery.v1_0; enum BatteryHealthState { diff --git a/light/v1_0/BUILD.gn b/light/v1_0/BUILD.gn index 33fffc65..63865454 100755 --- a/light/v1_0/BUILD.gn +++ b/light/v1_0/BUILD.gn @@ -20,8 +20,6 @@ if (defined(ohos_lite)) { } } else { hdi("light") { - package = "OHOS.HDI.light.v1_0" - module_name = "light_service" sources = [ diff --git a/light/v1_0/ILightInterface.idl b/light/v1_0/ILightInterface.idl index 75c61ada..fe124dd5 100755 --- a/light/v1_0/ILightInterface.idl +++ b/light/v1_0/ILightInterface.idl @@ -13,8 +13,8 @@ * limitations under the License. */ -package OHOS.HDI.light.v1_0; -import OHOS.HDI.light.v1_0.LightTypes; +package ohos.hdi.light.v1_0; +import ohos.hdi.light.v1_0.LightTypes; interface ILightInterface { GetLightInfo([out] struct HdfLightInfo[] info); diff --git a/light/v1_0/LightTypes.idl b/light/v1_0/LightTypes.idl index d6beab98..8ff6b522 100755 --- a/light/v1_0/LightTypes.idl +++ b/light/v1_0/LightTypes.idl @@ -13,7 +13,7 @@ * limitations under the License. */ -package OHOS.HDI.light.v1_0; +package ohos.hdi.light.v1_0; enum HdfLighType { HDF_LIGHT_TYPE_BATTERY = 1, diff --git a/power/v1_0/BUILD.gn b/power/v1_0/BUILD.gn index 04b22287..64aac630 100755 --- a/power/v1_0/BUILD.gn +++ b/power/v1_0/BUILD.gn @@ -19,8 +19,6 @@ if (defined(ohos_lite)) { } } else { hdi("power") { - package = "OHOS.HDI.power.v1_0" - module_name = "power_interface_service" sources = [ diff --git a/power/v1_0/IPowerHdiCallback.idl b/power/v1_0/IPowerHdiCallback.idl index 9a8fe2cc..0e63fb67 100755 --- a/power/v1_0/IPowerHdiCallback.idl +++ b/power/v1_0/IPowerHdiCallback.idl @@ -13,7 +13,7 @@ * limitations under the License. */ -package OHOS.HDI.power.v1_0; +package ohos.hdi.power.v1_0; [callback] interface IPowerHdiCallback { OnSuspend(); diff --git a/power/v1_0/IPowerInterface.idl b/power/v1_0/IPowerInterface.idl index 9a747677..272d5bff 100755 --- a/power/v1_0/IPowerInterface.idl +++ b/power/v1_0/IPowerInterface.idl @@ -13,9 +13,9 @@ * limitations under the License. */ -package OHOS.HDI.power.v1_0; -import OHOS.HDI.power.v1_0.IPowerHdiCallback; -import OHOS.HDI.power.v1_0.PowerTypes; +package ohos.hdi.power.v1_0; +import ohos.hdi.power.v1_0.IPowerHdiCallback; +import ohos.hdi.power.v1_0.PowerTypes; interface IPowerInterface { RegisterCallback([in] IPowerHdiCallback ipowerHdiCallback); diff --git a/power/v1_0/PowerTypes.idl b/power/v1_0/PowerTypes.idl index 086f5538..a23fa1ea 100755 --- a/power/v1_0/PowerTypes.idl +++ b/power/v1_0/PowerTypes.idl @@ -13,7 +13,7 @@ * limitations under the License. */ -package OHOS.HDI.power.v1_0; +package ohos.hdi.power.v1_0; enum PowerHdfCmd { CMD_REGISTER_CALLBCK = 0, diff --git a/sensor/v1_0/BUILD.gn b/sensor/v1_0/BUILD.gn index 0c196002..955cf38e 100644 --- a/sensor/v1_0/BUILD.gn +++ b/sensor/v1_0/BUILD.gn @@ -19,8 +19,6 @@ if (defined(ohos_lite)) { } } else { hdi("sensor") { - package = "OHOS.HDI.sensor.v1_0" - module_name = "sensor_service" sources = [ diff --git a/sensor/v1_0/ISensorCallback.idl b/sensor/v1_0/ISensorCallback.idl index ae2a75eb..72c4aebb 100644 --- a/sensor/v1_0/ISensorCallback.idl +++ b/sensor/v1_0/ISensorCallback.idl @@ -27,9 +27,9 @@ * @version 1.0 */ -package OHOS.HDI.sensor.v1_0; +package ohos.hdi.sensor.v1_0; -import OHOS.HDI.sensor.v1_0.SensorTypes; +import ohos.hdi.sensor.v1_0.SensorTypes; /** * @brief Defines the callback for reporting sensor data. This callback needs to be registered when diff --git a/sensor/v1_0/ISensorInterface.idl b/sensor/v1_0/ISensorInterface.idl index 66ab862d..0524106c 100644 --- a/sensor/v1_0/ISensorInterface.idl +++ b/sensor/v1_0/ISensorInterface.idl @@ -38,10 +38,10 @@ * @version 1.0 */ -package OHOS.HDI.sensor.v1_0; +package ohos.hdi.sensor.v1_0; -import OHOS.HDI.sensor.v1_0.SensorTypes; -import OHOS.HDI.sensor.v1_0.ISensorCallback; +import ohos.hdi.sensor.v1_0.SensorTypes; +import ohos.hdi.sensor.v1_0.ISensorCallback; /** * @brief Defines the functions for performing basic operations on sensors. diff --git a/sensor/v1_0/SensorTypes.idl b/sensor/v1_0/SensorTypes.idl index ab37a92c..2d44d9a2 100644 --- a/sensor/v1_0/SensorTypes.idl +++ b/sensor/v1_0/SensorTypes.idl @@ -37,7 +37,7 @@ * @version 1.0 */ -package OHOS.HDI.sensor.v1_0; +package ohos.hdi.sensor.v1_0; /** * @brief Defines basic sensor information. diff --git a/thermal/v1_0/BUILD.gn b/thermal/v1_0/BUILD.gn index 8ecfd7c9..0a33f8ec 100755 --- a/thermal/v1_0/BUILD.gn +++ b/thermal/v1_0/BUILD.gn @@ -19,8 +19,6 @@ if (defined(ohos_lite)) { } } else { hdi("thermal") { - package = "OHOS.HDI.thermal.v1_0" - module_name = "thermal_interface_service" sources = [ diff --git a/thermal/v1_0/IThermalCallback.idl b/thermal/v1_0/IThermalCallback.idl index 3b9f6b8a..dabc30c9 100755 --- a/thermal/v1_0/IThermalCallback.idl +++ b/thermal/v1_0/IThermalCallback.idl @@ -13,9 +13,9 @@ * limitations under the License. */ -package OHOS.HDI.thermal.v1_0; +package ohos.hdi.thermal.v1_0; -import OHOS.HDI.thermal.v1_0.ThermalTypes; +import ohos.hdi.thermal.v1_0.ThermalTypes; [callback] interface IThermalCallback { OnThermalDataEvent([in] struct HdfThermalCallbackInfo event); diff --git a/thermal/v1_0/IThermalInterface.idl b/thermal/v1_0/IThermalInterface.idl index 1709d908..30e6942a 100755 --- a/thermal/v1_0/IThermalInterface.idl +++ b/thermal/v1_0/IThermalInterface.idl @@ -13,10 +13,10 @@ * limitations under the License. */ -package OHOS.HDI.thermal.v1_0; +package ohos.hdi.thermal.v1_0; -import OHOS.HDI.thermal.v1_0.ThermalTypes; -import OHOS.HDI.thermal.v1_0.IThermalCallback; +import ohos.hdi.thermal.v1_0.ThermalTypes; +import ohos.hdi.thermal.v1_0.IThermalCallback; interface IThermalInterface { SetCpuFreq([in] int freq); diff --git a/thermal/v1_0/ThermalTypes.idl b/thermal/v1_0/ThermalTypes.idl index 8fc3d3a4..21cd989a 100755 --- a/thermal/v1_0/ThermalTypes.idl +++ b/thermal/v1_0/ThermalTypes.idl @@ -13,7 +13,7 @@ * limitations under the License. */ -package OHOS.HDI.thermal.v1_0; +package ohos.hdi.thermal.v1_0; struct ThermalZoneInfo { String type; diff --git a/vibrator/v1_0/BUILD.gn b/vibrator/v1_0/BUILD.gn index d53a7fac..489bd52a 100755 --- a/vibrator/v1_0/BUILD.gn +++ b/vibrator/v1_0/BUILD.gn @@ -19,8 +19,6 @@ if (defined(ohos_lite)) { } } else { hdi("vibrator") { - package = "OHOS.HDI.vibrator.v1_0" - module_name = "vibrator_service" sources = [ diff --git a/vibrator/v1_0/IVibratorInterface.idl b/vibrator/v1_0/IVibratorInterface.idl index 690ebd90..46d8d9eb 100755 --- a/vibrator/v1_0/IVibratorInterface.idl +++ b/vibrator/v1_0/IVibratorInterface.idl @@ -35,9 +35,9 @@ * @version 1.0 */ -package OHOS.HDI.vibrator.v1_0; +package ohos.hdi.vibrator.v1_0; -import OHOS.HDI.vibrator.v1_0.VibratorTypes; +import ohos.hdi.vibrator.v1_0.VibratorTypes; interface IVibratorInterface { /** diff --git a/vibrator/v1_0/VibratorTypes.idl b/vibrator/v1_0/VibratorTypes.idl index a93a4687..629ddb80 100755 --- a/vibrator/v1_0/VibratorTypes.idl +++ b/vibrator/v1_0/VibratorTypes.idl @@ -13,7 +13,7 @@ * limitations under the License. */ -package OHOS.HDI.vibrator.v1_0; +package ohos.hdi.vibrator.v1_0; /** * @brief Enumerates the vibration modes of this vibrator. -- Gitee