From 693d065d0f1c92ab66f79e1b82b92e29c634c915 Mon Sep 17 00:00:00 2001
From: compiler <compiler@compilerdeMac-mini.local>
Date: Mon, 15 Nov 2021 14:34:42 +0800
Subject: [PATCH] move file related with native from //utils to //utils/native

Signed-off-by: Liu Jialiang <liujialiang10@huawei.com>
---
 ndk_libraries_config/BUILD.gn                 | 25 ++++++++
 .../bit32/public.libraries-z.txt              | 13 +++++
 .../bit64/public.libraries-z.txt              | 13 +++++
 ohos.build                                    | 58 +++++++++++++++++++
 4 files changed, 109 insertions(+)
 create mode 100644 ndk_libraries_config/BUILD.gn
 create mode 100644 ndk_libraries_config/bit32/public.libraries-z.txt
 create mode 100644 ndk_libraries_config/bit64/public.libraries-z.txt
 create mode 100644 ohos.build

diff --git a/ndk_libraries_config/BUILD.gn b/ndk_libraries_config/BUILD.gn
new file mode 100644
index 0000000..811c35d
--- /dev/null
+++ b/ndk_libraries_config/BUILD.gn
@@ -0,0 +1,25 @@
+# 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("ndk_libs_config") {
+  if (current_cpu == "arm") {
+    source = "bit32/public.libraries-z.txt"
+  } else if (current_cpu == "arm64" || current_cpu == "amd64" ||
+             current_cpu == "x64" || current_cpu == "x86_64") {
+    source = "bit64/public.libraries-z.txt"
+  }
+  subsystem_name = "utils"
+  relative_install_dir = ""
+  part_name = "utils_base"
+}
diff --git a/ndk_libraries_config/bit32/public.libraries-z.txt b/ndk_libraries_config/bit32/public.libraries-z.txt
new file mode 100644
index 0000000..3e2cf56
--- /dev/null
+++ b/ndk_libraries_config/bit32/public.libraries-z.txt
@@ -0,0 +1,13 @@
+libhilog_ndk.z.so
+libzgraphic.z.so
+librawfile.z.so
+libsensors.z.so
+libeventhandler_native.z.so
+libimage_pixelmap.z.so
+libmedia_ndk.z.so
+libtrans_jni.z.so
+libhiappevent_base.z.so
+libipc_core.z.so
+libhisysevent_jni.z.so
+libteec.z.so
+
diff --git a/ndk_libraries_config/bit64/public.libraries-z.txt b/ndk_libraries_config/bit64/public.libraries-z.txt
new file mode 100644
index 0000000..8438f3f
--- /dev/null
+++ b/ndk_libraries_config/bit64/public.libraries-z.txt
@@ -0,0 +1,13 @@
+libhilog_ndk.z.so 64
+libzgraphic.z.so 64
+librawfile.z.so 64
+libsensors.z.so 64
+libeventhandler_native.z.so 64
+libimage_pixelmap.z.so 64
+libmedia_ndk.z.so 64
+libtrans_jni.z.so 64
+libhiappevent_base.z.so 64
+libipc_core.z.so 64
+libhisysevent_jni.z.so 64
+libteec.z.so 64
+
diff --git a/ohos.build b/ohos.build
new file mode 100644
index 0000000..e0fc2bc
--- /dev/null
+++ b/ohos.build
@@ -0,0 +1,58 @@
+{
+    "subsystem": "utils",
+    "parts": {
+        "utils_base": {
+            "module_list": [
+                "//utils/native/base:utils",
+                "//utils/native/ndk_libraries_config:ndk_libs_config"
+            ],
+            "inner_kits": [
+                {
+                    "name": "//utils/native/base:utils",
+                    "header": {
+                        "header_files": [
+                            "include/ashmem.h",
+                            "include/common_errors.h",
+                            "include/common_timer_errors.h",
+                            "include/datetime_ex.h",
+                            "include/directory_ex.h",
+                            "include/errors.h",
+                            "include/file_ex.h",
+                            "include/flat_obj.h",
+                            "include/nocopyable.h",
+                            "include/observer.h",
+                            "include/parcel.h",
+                            "include/pubdef.h",
+                            "include/refbase.h",
+                            "include/rwlock.h",
+                            "include/safe_block_queue.h",
+                            "include/safe_map.h",
+                            "include/safe_queue.h",
+                            "include/securec_p.h",
+                            "include/securec.h",
+                            "include/securectype.h",
+                            "include/semaphore_ex.h",
+                            "include/singleton.h",
+                            "include/sorted_vector.h",
+                            "include/string_ex.h",
+                            "include/thread_ex.h",
+                            "include/thread_pool.h",
+                            "include/timer.h",
+                            "include/unique_fd.h",
+                            "src/event_demultiplexer.h",
+                            "src/event_handler.h",
+                            "src/event_reactor.h",
+                            "src/timer_event_handler.h",
+                            "src/unicode_ex.h",
+                            "src/utils_log.h"
+                        ],
+                        "header_base": "//utils/native/base/"
+                    }
+                }
+            ],
+            "test_list": [
+                "//utils/native/base/test:unittest"
+            ]
+        }
+    }
+}
-- 
Gitee