diff --git a/device_info/BUILD.gn.orig b/device_info/BUILD.gn.orig deleted file mode 100644 index c6e87652ca44ae0e2b9ef5e2daad6f0930c396d7..0000000000000000000000000000000000000000 --- a/device_info/BUILD.gn.orig +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright (c) 2021 Huawei Device Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -import("//base/startup/init/begetd.gni") -if (!defined(ohos_lite)) { - import("//build/ohos.gni") - import("//build/ohos/sa_profile/sa_profile.gni") - - ohos_sa_profile("device_info_profile") { - sources = [ "etc/3902.xml" ] - part_name = "init" - } - - ohos_prebuilt_etc("device_info.cfg") { - source = "etc/deviceinfoservice.cfg" - relative_install_dir = "init" - part_name = "init" - } - - ohos_shared_library("deviceinfoservice") { - sources = [ - "//base/startup/init/interfaces/innerkits/syspara/param_comm.c", - "device_info_stub.cpp", - ] - - include_dirs = [ - ".", - "//base/startup/init/services/include/param", - "//base/startup/init/interfaces/innerkits/include", - "//base/startup/init/interfaces/innerkits/include/syspara", - "//base/startup/init/interfaces/innerkits/syspara", - "//base/startup/init/interfaces/hals", - ] - defines = [ - "INIT_AGENT", - "_GNU_SOURCE", - "USE_MBEDTLS", - ] - deps = [ - "//base/startup/init/interfaces/innerkits:libbegetutil", - "//third_party/bounds_checking_function:libsec_shared", - "//third_party/mbedtls:mbedtls_shared", - ] - - external_deps = [ - "access_token:libaccesstoken_sdk", - "hilog_native:libhilog", - "ipc:ipc_core", - "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", - "utils_base:utils", - ] - install_images = [ "system" ] - part_name = "init" - } -} - -group("device_info_group") { - if (!defined(ohos_lite) && enable_ohos_startup_init_feature_deviceinfo) { - deps = [ - ":device_info.cfg", - ":device_info_profile", - ":deviceinfoservice", - ] - } -} diff --git a/device_info/BUILD.gn.rej b/device_info/BUILD.gn.rej deleted file mode 100644 index 6efd6f2028a4591b752ba8357ff61f2deb4d690c..0000000000000000000000000000000000000000 --- a/device_info/BUILD.gn.rej +++ /dev/null @@ -1,22 +0,0 @@ ---- device_info/BUILD.gn -+++ device_info/BUILD.gn -@@ -31,7 +31,7 @@ ohos_shared_library("deviceinfoservice") { - "device_info_stub.cpp", - ] - -- include_dirs = [ -+ include_dirs = [ "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include/", - ".", - "//base/startup/init_lite/services/include/param", - "//base/startup/init_lite/interfaces/innerkits/include", -@@ -48,10 +48,8 @@ ohos_shared_library("deviceinfoservice") { - - external_deps = [ - "access_token:libaccesstoken_sdk", -- "hilog_native:libhilog", - "ipc:ipc_core", - "safwk:system_ability_fwk", -- "samgr_standard:samgr_proxy", - "utils_base:utils", - ] - install_images = [ "system" ] diff --git a/interfaces/kits/jskits/BUILD.gn.orig b/interfaces/kits/jskits/BUILD.gn.orig deleted file mode 100755 index 588afc772d70f6cdee4dcbe92f4a29250efd9acc..0000000000000000000000000000000000000000 --- a/interfaces/kits/jskits/BUILD.gn.orig +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import("//build/ohos.gni") - -ohos_shared_library("deviceinfo") { - include_dirs = [ "//base/startup/init/interfaces/innerkits/include" ] - - sources = [ "src/native_deviceinfo_js.cpp" ] - - deps = [ - "//base/startup/init/interfaces/innerkits:libbeget_proxy", - "//base/startup/init/interfaces/innerkits:libbegetutil", - ] - external_deps = [ - "hiviewdfx_hilog_native:libhilog", - "napi:ace_napi", - ] - relative_install_dir = "module" - subsystem_name = "startup" - part_name = "init" -} - -ohos_shared_library("systemparameter") { - include_dirs = [ - "src", - "//third_party/libuv/include", - ] - - sources = [ - "src/native_parameters_js.cpp", - "src/native_parameters_watch.cpp", - ] - - deps = [ - "//base/startup/init/interfaces/innerkits:libbeget_proxy", - "//base/startup/init/interfaces/innerkits:libbegetutil", - ] - - external_deps = [ - "hiviewdfx_hilog_native:libhilog", - "napi:ace_napi", - ] - relative_install_dir = "module" - subsystem_name = "startup" - part_name = "init" -} diff --git a/services/param/watcher/BUILD.gn.orig b/services/param/watcher/BUILD.gn.orig deleted file mode 100644 index 6a7825e3463b5f850e52d997ca3169e1fd8e7603..0000000000000000000000000000000000000000 --- a/services/param/watcher/BUILD.gn.orig +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright (c) 2021 Huawei Device Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -import("//build/ohos.gni") - -ohos_prebuilt_etc("param_watcher.rc") { - source = "etc/param_watcher.cfg" - relative_install_dir = "init" - part_name = "init" -} - -ohos_shared_library("param_watcher") { - sources = [ - "//base/startup/init/services/utils/list.c", - "proxy/watcher_manager.cpp", - "proxy/watcher_manager_stub.cpp", - "proxy/watcher_proxy.cpp", - ] - - include_dirs = [ - "//base/startup/init/services/param/include", - "//base/startup/init/services/include/param", - "//base/startup/init/services/param/linux", - "//base/startup/init/services/param/watcher/proxy", - "//base/startup/init/services/param/watcher/include", - "//base/startup/init/services/include", - "//base/startup/init/services/log", - "//base/startup/init/interfaces/innerkits/include", - "//base/startup/init/services/loopevent/include", - "//third_party/cJSON", - ] - - deps = [ - "//base/startup/init/interfaces/innerkits:libbegetutil", - "//third_party/bounds_checking_function:libsec_shared", - ] - - external_deps = [ - "ipc:ipc_core", - "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", - "utils_base:utils", - ] - install_images = [ "system" ] - part_name = "init" -}