!3 feat: add hilog compile gn files and remove default sqlite deps
From: @tian2020 Reviewed-by: @yukaii Signed-off-by: @yukaii
This commit is contained in:
openeuler-ci-bot
Gitee
commit
4bbbad87b9
26
0014-feat-delete-the-default-sqlite-deps.patch
Normal file
26
0014-feat-delete-the-default-sqlite-deps.patch
Normal file
@ -0,0 +1,26 @@
|
||||
From 2e2faeec378bf28912d3339afc24f1955f81fe02 Mon Sep 17 00:00:00 2001
|
||||
From: tian2020 <tian_hang@hoperun.com>
|
||||
Date: Thu, 15 Jun 2023 11:12:35 +0800
|
||||
Subject: [PATCH 1/2] feat delete the default sqlite deps
|
||||
|
||||
---
|
||||
common/BUILD.gn | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/common/BUILD.gn b/common/BUILD.gn
|
||||
index 4daf6bd..2a0cfe2 100755
|
||||
--- a/common/BUILD.gn
|
||||
+++ b/common/BUILD.gn
|
||||
@@ -23,7 +23,8 @@ group("common_packages") {
|
||||
if (device_name == "hi3516dv300") {
|
||||
assert(common_feature_verify)
|
||||
}
|
||||
- deps = [ "//third_party/sqlite:sqlite" ]
|
||||
+ #deps = [ "//third_party/sqlite:sqlite" ]
|
||||
+ deps = []
|
||||
|
||||
# deps += [ "musl:musl_install" ]
|
||||
|
||||
--
|
||||
2.33.0
|
||||
|
||||
236
0015-feat-and-hilog-gn-files.patch
Normal file
236
0015-feat-and-hilog-gn-files.patch
Normal file
@ -0,0 +1,236 @@
|
||||
From 1e4e43b6c5fc612c314e99914251235a37d839cb Mon Sep 17 00:00:00 2001
|
||||
From: tian2020 <tian_hang@hoperun.com>
|
||||
Date: Thu, 15 Jun 2023 14:15:23 +0800
|
||||
Subject: [PATCH 2/2] feat:and hilog gn files
|
||||
|
||||
---
|
||||
.../base/hiviewdfx/hilog/bundle.json | 37 ++++++++++
|
||||
.../hiviewdfx/hilog/interfaces/bundle.json | 74 +++++++++++++++++++
|
||||
.../hilog/interfaces/native/bundle.json | 37 ++++++++++
|
||||
.../interfaces/native/innerkits/BUILD.gn | 34 +++++++++
|
||||
.../hilog/interfaces/native/innerkits/include | 1 +
|
||||
5 files changed, 183 insertions(+)
|
||||
create mode 100644 openeuler/compiler_gn/base/hiviewdfx/hilog/bundle.json
|
||||
create mode 100644 openeuler/compiler_gn/base/hiviewdfx/hilog/interfaces/bundle.json
|
||||
create mode 100644 openeuler/compiler_gn/base/hiviewdfx/hilog/interfaces/native/bundle.json
|
||||
create mode 100644 openeuler/compiler_gn/base/hiviewdfx/hilog/interfaces/native/innerkits/BUILD.gn
|
||||
create mode 120000 openeuler/compiler_gn/base/hiviewdfx/hilog/interfaces/native/innerkits/include
|
||||
|
||||
diff --git a/openeuler/compiler_gn/base/hiviewdfx/hilog/bundle.json b/openeuler/compiler_gn/base/hiviewdfx/hilog/bundle.json
|
||||
new file mode 100644
|
||||
index 0000000..8bfadc0
|
||||
--- /dev/null
|
||||
+++ b/openeuler/compiler_gn/base/hiviewdfx/hilog/bundle.json
|
||||
@@ -0,0 +1,37 @@
|
||||
+{
|
||||
+ "name": "@ohos/hilog",
|
||||
+ "description": "Native log interface provided for system",
|
||||
+ "version": "3.1",
|
||||
+ "license": "Apache License 2.0",
|
||||
+ "publishAs": "code-segment",
|
||||
+ "segment": {
|
||||
+ "destPath": "base/hiviewdfx/hilog"
|
||||
+ },
|
||||
+ "dirs": {},
|
||||
+ "scripts": {},
|
||||
+ "component": {
|
||||
+ "name": "hilog",
|
||||
+ "subsystem": "hiviewdfx",
|
||||
+ "syscap": [
|
||||
+ "SystemCapability.HiviewDFX.HiLog"
|
||||
+ ],
|
||||
+ "adapted_system_type": [
|
||||
+ "standard"
|
||||
+ ],
|
||||
+ "rom": "188KB",
|
||||
+ "ram": "2000KB",
|
||||
+ "deps": {
|
||||
+ "components": [
|
||||
+ "init",
|
||||
+ "utils_base"
|
||||
+ ],
|
||||
+ "third_party": [
|
||||
+ "bounds_checking_function",
|
||||
+ "zlib"
|
||||
+ ]
|
||||
+ },
|
||||
+ "build": {
|
||||
+ "sub_component": []
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
diff --git a/openeuler/compiler_gn/base/hiviewdfx/hilog/interfaces/bundle.json b/openeuler/compiler_gn/base/hiviewdfx/hilog/interfaces/bundle.json
|
||||
new file mode 100644
|
||||
index 0000000..11eee3f
|
||||
--- /dev/null
|
||||
+++ b/openeuler/compiler_gn/base/hiviewdfx/hilog/interfaces/bundle.json
|
||||
@@ -0,0 +1,74 @@
|
||||
+{
|
||||
+ "name": "@ohos/hilog_native",
|
||||
+ "description": "Native log interface provided for system",
|
||||
+ "version": "3.1",
|
||||
+ "license": "Apache License 2.0",
|
||||
+ "publishAs": "code-segment",
|
||||
+ "segment": {
|
||||
+ "destPath": "base/hiviewdfx/hilog"
|
||||
+ },
|
||||
+ "dirs": {},
|
||||
+ "scripts": {},
|
||||
+ "component": {
|
||||
+ "name": "hilog_native",
|
||||
+ "subsystem": "hiviewdfx",
|
||||
+ "syscap": [
|
||||
+ "SystemCapability.HiviewDFX.HiLog"
|
||||
+ ],
|
||||
+ "adapted_system_type": [
|
||||
+ "standard"
|
||||
+ ],
|
||||
+ "rom": "188KB",
|
||||
+ "ram": "2000KB",
|
||||
+ "deps": {
|
||||
+ "components": [
|
||||
+ "c_utils",
|
||||
+ "init",
|
||||
+ "napi"
|
||||
+ ],
|
||||
+ "third_party": [
|
||||
+ "bounds_checking_function",
|
||||
+ "zlib"
|
||||
+ ]
|
||||
+ },
|
||||
+ "features": [
|
||||
+ "hilog_native_feature_ohcore"
|
||||
+ ],
|
||||
+ "build": {
|
||||
+ "group_type": {
|
||||
+ "base_group": [
|
||||
+
|
||||
+ ],
|
||||
+ "fwk_group": [],
|
||||
+ "service_group": [
|
||||
+ "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog_base",
|
||||
+ "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog"
|
||||
+ ]
|
||||
+ },
|
||||
+ "inner_kits": [
|
||||
+ {
|
||||
+ "name": "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
|
||||
+ "header": {
|
||||
+ "header_files": [
|
||||
+ "hilog/log.h",
|
||||
+ "hilog/log_c.h",
|
||||
+ "hilog/log_cpp.h",
|
||||
+ "hilog_trace.h"
|
||||
+ ],
|
||||
+ "header_base": "//base/hiviewdfx/hilog/interfaces/native/innerkits/include"
|
||||
+ }
|
||||
+ },
|
||||
+ {
|
||||
+ "name": "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog_base",
|
||||
+ "header": {
|
||||
+ "header_files": [
|
||||
+ "hilog_base/log_base.h"
|
||||
+ ],
|
||||
+ "header_base": "//base/hiviewdfx/hilog/interfaces/native/innerkits/include"
|
||||
+ }
|
||||
+ }
|
||||
+ ],
|
||||
+ "test": []
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
diff --git a/openeuler/compiler_gn/base/hiviewdfx/hilog/interfaces/native/bundle.json b/openeuler/compiler_gn/base/hiviewdfx/hilog/interfaces/native/bundle.json
|
||||
new file mode 100644
|
||||
index 0000000..d9e1950
|
||||
--- /dev/null
|
||||
+++ b/openeuler/compiler_gn/base/hiviewdfx/hilog/interfaces/native/bundle.json
|
||||
@@ -0,0 +1,37 @@
|
||||
+{
|
||||
+ "name": "@ohos/hiviewdfx_hilog_native",
|
||||
+ "description": "Native log interface provided for system",
|
||||
+ "version": "3.1",
|
||||
+ "license": "Apache License 2.0",
|
||||
+ "publishAs": "code-segment",
|
||||
+ "segment": {
|
||||
+ "destPath": "base/hiviewdfx/hilog"
|
||||
+ },
|
||||
+ "dirs": {},
|
||||
+ "scripts": {},
|
||||
+ "component": {
|
||||
+ "name": "hiviewdfx_hilog_native",
|
||||
+ "subsystem": "hiviewdfx",
|
||||
+ "syscap": [
|
||||
+ "SystemCapability.HiviewDFX.HiLog"
|
||||
+ ],
|
||||
+ "adapted_system_type": [
|
||||
+ "standard"
|
||||
+ ],
|
||||
+ "rom": "188KB",
|
||||
+ "ram": "2000KB",
|
||||
+ "deps": {
|
||||
+ "components": [
|
||||
+ "init",
|
||||
+ "utils_base"
|
||||
+ ],
|
||||
+ "third_party": [
|
||||
+ "bounds_checking_function",
|
||||
+ "zlib"
|
||||
+ ]
|
||||
+ },
|
||||
+ "build": {
|
||||
+ "sub_component": []
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
\ No newline at end of file
|
||||
diff --git a/openeuler/compiler_gn/base/hiviewdfx/hilog/interfaces/native/innerkits/BUILD.gn b/openeuler/compiler_gn/base/hiviewdfx/hilog/interfaces/native/innerkits/BUILD.gn
|
||||
new file mode 100644
|
||||
index 0000000..bd1f91b
|
||||
--- /dev/null
|
||||
+++ b/openeuler/compiler_gn/base/hiviewdfx/hilog/interfaces/native/innerkits/BUILD.gn
|
||||
@@ -0,0 +1,34 @@
|
||||
+# 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")
|
||||
+
|
||||
+config("libhilog_pub_config") {
|
||||
+ include_dirs = [ "include" ]
|
||||
+ libs = ["hilog.z"]
|
||||
+}
|
||||
+
|
||||
+group("libhilog") {
|
||||
+ public_configs = [ ":libhilog_pub_config" ]
|
||||
+}
|
||||
+
|
||||
+config("libhilog_base_pub_cfg") {
|
||||
+ include_dirs = [ "include" ]
|
||||
+}
|
||||
+
|
||||
+ohos_prebuilt_static_library("libhilog_base") {
|
||||
+ source = "/usr/lib64/libhilog_base.a"
|
||||
+ public_configs = [ ":libhilog_base_pub_cfg" ]
|
||||
+
|
||||
+ part_name = "hilog_native"
|
||||
+ subsystem_name = "hiviewdfx"
|
||||
+}
|
||||
diff --git a/openeuler/compiler_gn/base/hiviewdfx/hilog/interfaces/native/innerkits/include b/openeuler/compiler_gn/base/hiviewdfx/hilog/interfaces/native/innerkits/include
|
||||
new file mode 120000
|
||||
index 0000000..50b90d9
|
||||
--- /dev/null
|
||||
+++ b/openeuler/compiler_gn/base/hiviewdfx/hilog/interfaces/native/innerkits/include
|
||||
@@ -0,0 +1 @@
|
||||
+/usr/include/hilog/
|
||||
\ No newline at end of file
|
||||
--
|
||||
2.33.0
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
%global openHarmony_source_release OpenHarmony-v3.2-Release
|
||||
Name: distributed-build
|
||||
Version: 1.0.0
|
||||
Release: 1
|
||||
Release: 2
|
||||
Summary: openEuler embedded softbus build tools
|
||||
License: Apache-2.0
|
||||
URL: https://gitee.com/openharmony/build
|
||||
@ -21,6 +21,8 @@ Patch0010: 0010-feat-use-include-samgr-for-samgr-include-files-confi.patch
|
||||
Patch0011: 0011-feat-use-.z-for-libs-name.patch
|
||||
Patch0012: 0012-fix-rpm-build-fail-caused-by-wrong-useless-code.patch
|
||||
Patch0013: 0013-feature-use-llvm-tools-version-15-for-build.patch
|
||||
Patch0014: 0014-feat-delete-the-default-sqlite-deps.patch
|
||||
Patch0015: 0015-feat-and-hilog-gn-files.patch
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
@ -41,5 +43,8 @@ cp -rp %{_builddir}/build-%{openHarmony_source_release}/* %{buildroot}/opt/dist
|
||||
/opt/distributed-middleware-build
|
||||
|
||||
%changelog
|
||||
* Thu Jun 15 tianhang <tian_hang@hoperun.com> - 1.0.0-2
|
||||
- add hilog compile gn files and remove default sqlite deps
|
||||
|
||||
* Tue May 30 2023 tianhang <tian_hang@hoperun.com> - 1.0.0-1
|
||||
- Init and Adapt to Openeuler
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user