diff --git a/libsnd/BUILD.gn b/frameworks/innerkitsimpl/libsnd/BUILD.gn similarity index 99% rename from libsnd/BUILD.gn rename to frameworks/innerkitsimpl/libsnd/BUILD.gn index 300fd6e36094953e1621522758bf99926caff624..df184f0ab112d93087a947cc4062a9bf37c4c38b 100644 --- a/libsnd/BUILD.gn +++ b/frameworks/innerkitsimpl/libsnd/BUILD.gn @@ -1,7 +1,7 @@ import("//build/ohos.gni") libsndfile_dir = "//third_party/libsnd" -libsndfile_build_path = "//foundation/multimedia/audio_standard/libsnd" +libsndfile_build_path = "//foundation/multimedia/audio_standard/frameworks/innerkitsimpl/libsnd" config("sndfile_config") { visibility = [ ":*" ] diff --git a/libsnd/include/config.h b/frameworks/innerkitsimpl/libsnd/include/config.h similarity index 100% rename from libsnd/include/config.h rename to frameworks/innerkitsimpl/libsnd/include/config.h diff --git a/libsnd/include/sndfile.h b/frameworks/innerkitsimpl/libsnd/include/sndfile.h similarity index 100% rename from libsnd/include/sndfile.h rename to frameworks/innerkitsimpl/libsnd/include/sndfile.h diff --git a/pulseaudio/BUILD.gn b/frameworks/innerkitsimpl/pulseaudio/BUILD.gn similarity index 94% rename from pulseaudio/BUILD.gn rename to frameworks/innerkitsimpl/pulseaudio/BUILD.gn index d36a841f5ee64a02e479ce0eac606168a22276e6..86bfbf60f1fa03f2b831234c8a273258bd633804 100644 --- a/pulseaudio/BUILD.gn +++ b/frameworks/innerkitsimpl/pulseaudio/BUILD.gn @@ -13,8 +13,8 @@ import("//build/ohos.gni") -pulseaudio_build_path = "//foundation/multimedia/audio_standard/pulseaudio" -libsndfile_build_path = "//foundation/multimedia/audio_standard/libsnd" +pulseaudio_build_path = "//foundation/multimedia/audio_standard/frameworks/innerkitsimpl/pulseaudio" +libsndfile_build_path = "//foundation/multimedia/audio_standard/frameworks/innerkitsimpl/libsnd" group("pulseaudio_packages") { deps = [ @@ -42,7 +42,7 @@ group("pulseaudio_packages") { } action("gen_config_header") { - script = "//foundation/multimedia/audio_standard/pulseaudio/ohos_paconfig.sh" + script = "$pulseaudio_build_path/ohos_paconfig.sh" args = [ rebase_path("//third_party/pulseaudio", root_build_dir), rebase_path( "${target_gen_dir}/", root_build_dir),] diff --git a/pulseaudio/conf/client.conf b/frameworks/innerkitsimpl/pulseaudio/conf/client.conf similarity index 100% rename from pulseaudio/conf/client.conf rename to frameworks/innerkitsimpl/pulseaudio/conf/client.conf diff --git a/pulseaudio/conf/daemon.conf b/frameworks/innerkitsimpl/pulseaudio/conf/daemon.conf similarity index 100% rename from pulseaudio/conf/daemon.conf rename to frameworks/innerkitsimpl/pulseaudio/conf/daemon.conf diff --git a/pulseaudio/conf/default.pa b/frameworks/innerkitsimpl/pulseaudio/conf/default.pa similarity index 100% rename from pulseaudio/conf/default.pa rename to frameworks/innerkitsimpl/pulseaudio/conf/default.pa diff --git a/pulseaudio/include/config.h b/frameworks/innerkitsimpl/pulseaudio/include/config.h similarity index 100% rename from pulseaudio/include/config.h rename to frameworks/innerkitsimpl/pulseaudio/include/config.h diff --git a/pulseaudio/include/ltdl.h b/frameworks/innerkitsimpl/pulseaudio/include/ltdl.h similarity index 100% rename from pulseaudio/include/ltdl.h rename to frameworks/innerkitsimpl/pulseaudio/include/ltdl.h diff --git a/pulseaudio/include/pulse/version.h b/frameworks/innerkitsimpl/pulseaudio/include/pulse/version.h similarity index 100% rename from pulseaudio/include/pulse/version.h rename to frameworks/innerkitsimpl/pulseaudio/include/pulse/version.h diff --git a/pulseaudio/ohos_paconfig.sh b/frameworks/innerkitsimpl/pulseaudio/ohos_paconfig.sh similarity index 100% rename from pulseaudio/ohos_paconfig.sh rename to frameworks/innerkitsimpl/pulseaudio/ohos_paconfig.sh diff --git a/pulseaudio/src/BUILD.gn b/frameworks/innerkitsimpl/pulseaudio/src/BUILD.gn similarity index 95% rename from pulseaudio/src/BUILD.gn rename to frameworks/innerkitsimpl/pulseaudio/src/BUILD.gn index 71c492c3554d4f57b55c5f3728f262fac0edbe99..da8fac3376cf8f0a72865103e672a11046c78420 100644 --- a/pulseaudio/src/BUILD.gn +++ b/frameworks/innerkitsimpl/pulseaudio/src/BUILD.gn @@ -14,8 +14,8 @@ import("//build/ohos.gni") pulseaudio_dir = "//third_party/pulseaudio" -pulseaudio_build_path = "//foundation/multimedia/audio_standard/pulseaudio" -libsndfile_build_path = "//foundation/multimedia/audio_standard/libsnd" +pulseaudio_build_path = "//foundation/multimedia/audio_standard/frameworks/innerkitsimpl/pulseaudio" +libsndfile_build_path = "//foundation/multimedia/audio_standard/frameworks/innerkitsimpl/libsnd" config("pulsecommon_config") { visibility = [ ":*" ] @@ -127,7 +127,7 @@ ohos_shared_library("pulsecommon") { part_name = "multimedia_audio_standard" } ohos_prebuilt_etc("pa_daemon_config") { - source = "//foundation/multimedia/audio_standard/pulseaudio/conf/daemon.conf" + source = "$pulseaudio_build_path/conf/daemon.conf" subsystem_name = "multimedia" module_install_dir = "etc/pulse" @@ -135,14 +135,14 @@ ohos_prebuilt_etc("pa_daemon_config") { } ohos_prebuilt_etc("pa_default_config") { - source = "//foundation/multimedia/audio_standard/pulseaudio/conf/default.pa" + source = "$pulseaudio_build_path/conf/default.pa" subsystem_name = "multimedia" module_install_dir = "etc/pulse" part_name = "multimedia_audio_standard" } ohos_prebuilt_etc("pa_client_config") { - source = "//foundation/multimedia/audio_standard/pulseaudio/conf/client.conf" + source = "$pulseaudio_build_path/conf/client.conf" subsystem_name = "multimedia" module_install_dir = "etc/pulse" part_name = "multimedia_audio_standard" diff --git a/pulseaudio/src/daemon/BUILD.gn b/frameworks/innerkitsimpl/pulseaudio/src/daemon/BUILD.gn similarity index 97% rename from pulseaudio/src/daemon/BUILD.gn rename to frameworks/innerkitsimpl/pulseaudio/src/daemon/BUILD.gn index e72361f3ce4fbd8389299cabdb1fac1287513ba6..89868e9edb9fd10c2a6e256a7a5f200f070b0e1c 100644 --- a/pulseaudio/src/daemon/BUILD.gn +++ b/frameworks/innerkitsimpl/pulseaudio/src/daemon/BUILD.gn @@ -13,7 +13,7 @@ import("//build/ohos.gni") -pulseaudio_build_path = "//foundation/multimedia/audio_standard/pulseaudio" +pulseaudio_build_path = "//foundation/multimedia/audio_standard/frameworks/innerkitsimpl/pulseaudio" pulseaudio_dir = "//third_party/pulseaudio" config("daemon_config") { diff --git a/pulseaudio/src/daemon/ohos_daemon-conf.c b/frameworks/innerkitsimpl/pulseaudio/src/daemon/ohos_daemon-conf.c similarity index 100% rename from pulseaudio/src/daemon/ohos_daemon-conf.c rename to frameworks/innerkitsimpl/pulseaudio/src/daemon/ohos_daemon-conf.c diff --git a/pulseaudio/src/daemon/ohos_pa_main.c b/frameworks/innerkitsimpl/pulseaudio/src/daemon/ohos_pa_main.c similarity index 100% rename from pulseaudio/src/daemon/ohos_pa_main.c rename to frameworks/innerkitsimpl/pulseaudio/src/daemon/ohos_pa_main.c diff --git a/pulseaudio/src/modules/BUILD.gn b/frameworks/innerkitsimpl/pulseaudio/src/modules/BUILD.gn similarity index 99% rename from pulseaudio/src/modules/BUILD.gn rename to frameworks/innerkitsimpl/pulseaudio/src/modules/BUILD.gn index e02fe306300d2575b8c8c150b06f4758b5be161c..f85914bd381bbb4c2e1a609ca8dc3f086ed9cd0c 100644 --- a/pulseaudio/src/modules/BUILD.gn +++ b/frameworks/innerkitsimpl/pulseaudio/src/modules/BUILD.gn @@ -14,7 +14,7 @@ import("//build/ohos.gni") pulseaudio_dir = "//third_party/pulseaudio" -pulseaudio_build_path = "//foundation/multimedia/audio_standard/pulseaudio" +pulseaudio_build_path = "//foundation/multimedia/audio_standard/frameworks/innerkitsimpl/pulseaudio" group("modules") { deps = [ diff --git a/pulseaudio/src/modules/hdi/BUILD.gn b/frameworks/innerkitsimpl/pulseaudio/src/modules/hdi/BUILD.gn similarity index 98% rename from pulseaudio/src/modules/hdi/BUILD.gn rename to frameworks/innerkitsimpl/pulseaudio/src/modules/hdi/BUILD.gn index 5de40efcd33823ea0f3d5111c3ba510037f097f7..83fcf98202872511e159352036231b9992ffb3ef 100644 --- a/pulseaudio/src/modules/hdi/BUILD.gn +++ b/frameworks/innerkitsimpl/pulseaudio/src/modules/hdi/BUILD.gn @@ -14,7 +14,7 @@ import("//build/ohos.gni") pulseaudio_dir = "//third_party/pulseaudio" -pulseaudio_build_path = "//foundation/multimedia/audio_standard/pulseaudio" +pulseaudio_build_path = "//foundation/multimedia/audio_standard/frameworks/innerkitsimpl/pulseaudio" config("hdi_config") { visibility = [ ":*" ] diff --git a/pulseaudio/src/modules/hdi/hdi_sink.c b/frameworks/innerkitsimpl/pulseaudio/src/modules/hdi/hdi_sink.c similarity index 100% rename from pulseaudio/src/modules/hdi/hdi_sink.c rename to frameworks/innerkitsimpl/pulseaudio/src/modules/hdi/hdi_sink.c diff --git a/pulseaudio/src/modules/hdi/hdi_source.c b/frameworks/innerkitsimpl/pulseaudio/src/modules/hdi/hdi_source.c similarity index 100% rename from pulseaudio/src/modules/hdi/hdi_source.c rename to frameworks/innerkitsimpl/pulseaudio/src/modules/hdi/hdi_source.c diff --git a/pulseaudio/src/modules/hdi/module_hdi_sink.c b/frameworks/innerkitsimpl/pulseaudio/src/modules/hdi/module_hdi_sink.c similarity index 100% rename from pulseaudio/src/modules/hdi/module_hdi_sink.c rename to frameworks/innerkitsimpl/pulseaudio/src/modules/hdi/module_hdi_sink.c diff --git a/pulseaudio/src/modules/hdi/module_hdi_source.c b/frameworks/innerkitsimpl/pulseaudio/src/modules/hdi/module_hdi_source.c similarity index 100% rename from pulseaudio/src/modules/hdi/module_hdi_source.c rename to frameworks/innerkitsimpl/pulseaudio/src/modules/hdi/module_hdi_source.c diff --git a/pulseaudio/src/pulse/BUILD.gn b/frameworks/innerkitsimpl/pulseaudio/src/pulse/BUILD.gn similarity index 98% rename from pulseaudio/src/pulse/BUILD.gn rename to frameworks/innerkitsimpl/pulseaudio/src/pulse/BUILD.gn index 08c1f4ca6bd5d469b0fb5fd17fdebfbf8a2afca6..797695996b6c234a39a11963313bfd75d8aff35b 100644 --- a/pulseaudio/src/pulse/BUILD.gn +++ b/frameworks/innerkitsimpl/pulseaudio/src/pulse/BUILD.gn @@ -14,7 +14,7 @@ import("//build/ohos.gni") pulseaudio_dir = "//third_party/pulseaudio" -pulseaudio_build_path = "//foundation/multimedia/audio_standard/pulseaudio" +pulseaudio_build_path = "//foundation/multimedia/audio_standard/frameworks/innerkitsimpl/pulseaudio" config("pulse_config") { visibility = [ ":*" ] diff --git a/pulseaudio/src/pulse/ohos_glib-mainloop.c b/frameworks/innerkitsimpl/pulseaudio/src/pulse/ohos_glib-mainloop.c similarity index 100% rename from pulseaudio/src/pulse/ohos_glib-mainloop.c rename to frameworks/innerkitsimpl/pulseaudio/src/pulse/ohos_glib-mainloop.c diff --git a/pulseaudio/src/pulse/ohos_pa_volume.c b/frameworks/innerkitsimpl/pulseaudio/src/pulse/ohos_pa_volume.c similarity index 100% rename from pulseaudio/src/pulse/ohos_pa_volume.c rename to frameworks/innerkitsimpl/pulseaudio/src/pulse/ohos_pa_volume.c diff --git a/pulseaudio/src/pulsecore/BUILD.gn b/frameworks/innerkitsimpl/pulseaudio/src/pulsecore/BUILD.gn similarity index 98% rename from pulseaudio/src/pulsecore/BUILD.gn rename to frameworks/innerkitsimpl/pulseaudio/src/pulsecore/BUILD.gn index 2a29c259c3826276a0bf3d5028fd0d25201cc1d2..80737bb00d46f6f042d00f12bab1084e5a8ee366 100644 --- a/pulseaudio/src/pulsecore/BUILD.gn +++ b/frameworks/innerkitsimpl/pulseaudio/src/pulsecore/BUILD.gn @@ -14,8 +14,8 @@ import("//build/ohos.gni") pulseaudio_dir = "//third_party/pulseaudio" -pulseaudio_build_path = "//foundation/multimedia/audio_standard/pulseaudio" -libsndfile_build_path = "//foundation/multimedia/audio_standard/libsnd" +pulseaudio_build_path = "//foundation/multimedia/audio_standard/frameworks/innerkitsimpl/pulseaudio" +libsndfile_build_path = "//foundation/multimedia/audio_standard/frameworks/innerkitsimpl/libsnd" config("pulsecore_config") { visibility = [ ":*" ] diff --git a/pulseaudio/src/pulsecore/ltdl-stub.c b/frameworks/innerkitsimpl/pulseaudio/src/pulsecore/ltdl-stub.c similarity index 100% rename from pulseaudio/src/pulsecore/ltdl-stub.c rename to frameworks/innerkitsimpl/pulseaudio/src/pulsecore/ltdl-stub.c diff --git a/pulseaudio/src/utils/BUILD.gn b/frameworks/innerkitsimpl/pulseaudio/src/utils/BUILD.gn similarity index 96% rename from pulseaudio/src/utils/BUILD.gn rename to frameworks/innerkitsimpl/pulseaudio/src/utils/BUILD.gn index 7722a9e593664c9f66f18ec19effb1a366771f99..39a40462bbddff84667a8a5f979779c14a07c201 100644 --- a/pulseaudio/src/utils/BUILD.gn +++ b/frameworks/innerkitsimpl/pulseaudio/src/utils/BUILD.gn @@ -14,8 +14,8 @@ import("//build/ohos.gni") pulseaudio_dir = "//third_party/pulseaudio" -pulseaudio_build_path = "//foundation/multimedia/audio_standard/pulseaudio" -libsndfile_build_path = "//foundation/multimedia/audio_standard/libsnd" +pulseaudio_build_path = "//foundation/multimedia/audio_standard/frameworks/innerkitsimpl/pulseaudio" +libsndfile_build_path = "//foundation/multimedia/audio_standard/frameworks/innerkitsimpl/libsnd" config("pulseutils_config") { visibility = [ ":*" ] diff --git a/interfaces/innerkits/native/audiomanager/BUILD.gn b/interfaces/innerkits/native/audiomanager/BUILD.gn index 9eb2044ff8502fb31f73f332cc51390c4c6e2bd0..7e065663fd94de2d5f4a9cae20653d85e4474dc9 100644 --- a/interfaces/innerkits/native/audiomanager/BUILD.gn +++ b/interfaces/innerkits/native/audiomanager/BUILD.gn @@ -14,7 +14,7 @@ import("//build/ohos.gni") pulseaudio_dir = "//third_party/pulseaudio" -pulseaudio_build_path = "//foundation/multimedia/audio_standard/pulseaudio" +pulseaudio_build_path = "//foundation/multimedia/audio_standard/frameworks/innerkitsimpl/pulseaudio" group("audio_client_test_packages") { deps = [ @@ -69,7 +69,7 @@ ohos_shared_library("audio_client") { deps = [ "//utils/native/base:utils", - "//foundation/multimedia/audio_standard/pulseaudio/src/pulse:pulse", + "//foundation/multimedia/audio_standard/frameworks/innerkitsimpl/pulseaudio/src/pulse:pulse", "//third_party/bounds_checking_function:libsec_static", "//foundation/multimedia/audio_standard/interfaces/innerkits/native/audiopolicy:audio_policy_client", ] diff --git a/ohos.build b/ohos.build index 92ca3e932ea92101ad842d9007f245dd431e3277..7c5667c56b4f856c8a0b97308647fbeba8fc83cf 100644 --- a/ohos.build +++ b/ohos.build @@ -11,7 +11,7 @@ "//foundation/multimedia/audio_standard/sa_profile:audio_service_sa_profile", "//foundation/multimedia/audio_standard/interfaces/kits/js/audio_manager:audio", "//foundation/multimedia/audio_standard/interfaces/kits/js/audio_manager:audio_js", - "//foundation/multimedia/audio_standard/pulseaudio:pulseaudio_packages", + "//foundation/multimedia/audio_standard/frameworks/innerkitsimpl/pulseaudio:pulseaudio_packages", "//foundation/multimedia/audio_standard/interfaces/innerkits/native/audiomanager:audio_client_test_packages", "//foundation/multimedia/audio_standard/interfaces/innerkits/native/audiorecorder:audio_recorder_test_packages", "//foundation/multimedia/audio_standard/interfaces/innerkits/native/audiorenderer:audio_renderer_test", diff --git a/services/BUILD.gn b/services/BUILD.gn index 77d53bec1984f32d7047b7c1a90ffcca5eed60b8..259fc18f65d35d83e448d4d302edb7670c4308c9 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -55,7 +55,7 @@ ohos_shared_library("audio_service") { deps = [ "//utils/native/base:utils", "//foundation/multimedia/audio_standard/interfaces/innerkits/native/audiomanager:audio_client", - "//foundation/multimedia/audio_standard/pulseaudio/src/daemon:pulseaudio", + "//foundation/multimedia/audio_standard/frameworks/innerkitsimpl/pulseaudio/src/daemon:pulseaudio", "//foundation/multimedia/audio_standard/frameworks/innerkitsimpl/audiocapturer:audio_capturer_source", ] @@ -113,7 +113,7 @@ config("audio_policy_public_config") { "//third_party/libxml2/include", "//third_party/pulseaudio/src", "//third_party/pulseaudio/confgure/src", - "//foundation/multimedia/audio_standard/pulseaudio/include", + "//foundation/multimedia/audio_standard/frameworks/innerkitsimpl/pulseaudio/include", "//utils/system/safwk/native/include", "//utils/native/base/include", "//third_party/bounds_checking_function/include", @@ -145,7 +145,7 @@ ohos_shared_library("audio_policy_service") { deps = [ "//utils/native/base:utils", - "//foundation/multimedia/audio_standard/pulseaudio/src/pulse:pulse", + "//foundation/multimedia/audio_standard/frameworks/innerkitsimpl/pulseaudio/src/pulse:pulse", "//third_party/libxml2:xml2", "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata:distributeddata_inner", "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter:distributeddata_adapter",