From 1e13258446c48cb5bfd803eca924461a70c5dcb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=AD=A6=E6=B5=B7?= Date: Tue, 30 Jul 2024 03:01:50 +0000 Subject: [PATCH 1/3] update bundle.json. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 许学海 --- bundle.json | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/bundle.json b/bundle.json index ef123afd..1db6e75d 100644 --- a/bundle.json +++ b/bundle.json @@ -28,7 +28,17 @@ }, "build": { "sub_component": [ "//third_party/alsa-lib:libasound" ], - "inner_kits": [], + "inner_kits": [ + { + "type": "so", + "name": "//third_party/alsa-lib:libasound", + "header": { + "header_base": "//third_party/alsa-lib", + "header_files": [ + ] + } + } + ], "test": [] } } -- Gitee From f35c7210df21b823eee0bd051225da4ca13ce00f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=AD=A6=E6=B5=B7?= Date: Tue, 30 Jul 2024 03:08:05 +0000 Subject: [PATCH 2/3] update BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 许学海 --- BUILD.gn | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/BUILD.gn b/BUILD.gn index aaf8586e..9006db93 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -13,6 +13,23 @@ import("//build/ohos.gni") +config("alsa_lib_header") { + include_dirs = [ + "//third_party/alsa-lib/include", + "//third_party/alsa-lib/include/sound", + "//third_party/alsa-lib/include/uapi", + "//third_party/alsa-lib/src/pcm", + "//third_party/alsa-lib/src/ucm", + "//third_party/alsa-lib/src/mixer", + "//third_party/alsa-lib/src/seq", + "//third_party/alsa-lib/src/hwdep", + "//third_party/alsa-lib/src/rawmidi", + "//third_party/alsa-lib/src/control", + "//third_party/alsa-lib/src/timer", + "{target_gen_dir}/include/" + ] +} + config("alsa_lib_config") { cflags = [ "-Wno-sign-compare", @@ -170,6 +187,7 @@ ohos_shared_library("libasound") { # conf files "src/conf:alsa-lib-prebuilt-all", ] + public_configs = [ ":alsa_lib_header" ] output_extension = "so" install_images = [ chipset_base_dir ] install_enable = true -- Gitee From cebd91cc34d68c01c327aec8006463e5834890bd Mon Sep 17 00:00:00 2001 From: xuxuehai Date: Wed, 31 Jul 2024 10:55:58 +0800 Subject: [PATCH 3/3] commit msg Signed-off-by: xuxuehai --- BUILD.gn | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 9006db93..23a8e720 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -14,20 +14,20 @@ import("//build/ohos.gni") config("alsa_lib_header") { - include_dirs = [ - "//third_party/alsa-lib/include", - "//third_party/alsa-lib/include/sound", - "//third_party/alsa-lib/include/uapi", - "//third_party/alsa-lib/src/pcm", - "//third_party/alsa-lib/src/ucm", - "//third_party/alsa-lib/src/mixer", - "//third_party/alsa-lib/src/seq", - "//third_party/alsa-lib/src/hwdep", - "//third_party/alsa-lib/src/rawmidi", - "//third_party/alsa-lib/src/control", - "//third_party/alsa-lib/src/timer", - "{target_gen_dir}/include/" - ] + include_dirs = [ + "//third_party/alsa-lib/include", + "//third_party/alsa-lib/include/sound", + "//third_party/alsa-lib/include/uapi", + "//third_party/alsa-lib/src/pcm", + "//third_party/alsa-lib/src/ucm", + "//third_party/alsa-lib/src/mixer", + "//third_party/alsa-lib/src/seq", + "//third_party/alsa-lib/src/hwdep", + "//third_party/alsa-lib/src/rawmidi", + "//third_party/alsa-lib/src/control", + "//third_party/alsa-lib/src/timer", + "{target_gen_dir}/include/", + ] } config("alsa_lib_config") { -- Gitee