From e773c20fb02091c8e24ca11e6f0b0de53a2ec10c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=86=8A=E7=A3=8A?= Date: Tue, 22 Nov 2022 14:05:36 +0000 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!1529=20?= =?UTF-8?q?:=20FIX:=20=E4=BF=AE=E6=94=B9lite=5Fm=20PARAM=5FWORKSPACE=5FMAX?= =?UTF-8?q?=E5=86=85=E5=AD=98=E5=A4=A7=E5=B0=8F=20=E6=8C=91=E5=8D=95monthl?= =?UTF-8?q?y1018=E5=88=86=E6=94=AF'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/etc/BUILD.gn | 12 ------------ services/etc/param/ohos.para | 2 ++ services/etc/param/ohos.startup.para | 15 --------------- services/param/include/param_osadp.h | 2 +- 4 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 services/etc/param/ohos.startup.para diff --git a/services/etc/BUILD.gn b/services/etc/BUILD.gn index 55b0952b..8a482b1f 100755 --- a/services/etc/BUILD.gn +++ b/services/etc/BUILD.gn @@ -125,17 +125,6 @@ if (defined(ohos_lite)) { module_install_dir = "etc/param" } - ohos_prebuilt_para("ohos.startup.para") { - source = "//base/startup/init/services/etc/param/ohos.startup.para" - install_images = [ - "system", - "updater", - ] - part_name = "init" - subsystem_name = "startup" - module_install_dir = "etc/param" - } - ohos_prebuilt_para("ohos.para.dac") { source = "//base/startup/init/services/etc/param/ohos.para.dac" install_images = [ @@ -243,7 +232,6 @@ if (defined(ohos_lite)) { ":ohos.para", ":ohos.para.dac", ":ohos.para.size", - ":ohos.startup.para", ":ohos_const.para", ":passwd", ":syscap.json", diff --git a/services/etc/param/ohos.para b/services/etc/param/ohos.para index e93bbaca..493016f2 100755 --- a/services/etc/param/ohos.para +++ b/services/etc/param/ohos.para @@ -20,6 +20,8 @@ const.debuggable=1 const.build.characteristics=default const.product.model=ohos const.product.name="OpenHarmony 3.2" +persist.sys.usb.config=hdc +persist.init.bootevent.enable=true const.sandbox=enable const.product.devicetype=default const.software.model=default diff --git a/services/etc/param/ohos.startup.para b/services/etc/param/ohos.startup.para deleted file mode 100644 index 1a039250..00000000 --- a/services/etc/param/ohos.startup.para +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 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. - -persist.sys.usb.config=hdc -persist.init.bootevent.enable=true \ No newline at end of file diff --git a/services/param/include/param_osadp.h b/services/param/include/param_osadp.h index c537cd18..ba7e7d02 100755 --- a/services/param/include/param_osadp.h +++ b/services/param/include/param_osadp.h @@ -59,7 +59,7 @@ extern "C" { #ifdef STARTUP_INIT_TEST #define PARAM_WORKSPACE_MAX (1024 * 50) #else -#define PARAM_WORKSPACE_MAX (1024 * 4) +#define PARAM_WORKSPACE_MAX (1024 * 30) #endif #define PARAM_WORKSPACE_SMALL PARAM_WORKSPACE_MAX #define PARAM_WORKSPACE_DEF PARAM_WORKSPACE_MAX -- GitLab