diff --git a/audio/audio.gni b/audio/audio.gni index d1840ebcf4b7ee4f851af23a67386a78451f1de2..6500ef4f0c8e4c78d52b61b96f80ef77ea0dad8a 100644 --- a/audio/audio.gni +++ b/audio/audio.gni @@ -19,6 +19,7 @@ declare_args() { drivers_peripheral_audio_alsa_lib = false drivers_peripheral_audio_rich_device = false drivers_peripheral_audio_community = true + drivers_peripheral_audio_feature_effect = false } if (product_name == "ohos-arm64") { diff --git a/audio/bundle.json b/audio/bundle.json index a1e89a5652a474549c0b43fc4321ecbefe29af44..2a806790ef220fac756d974874a4594a7742b8c6 100755 --- a/audio/bundle.json +++ b/audio/bundle.json @@ -21,7 +21,8 @@ "drivers_peripheral_audio_policy_config", "drivers_peripheral_audio_alsa_lib", "drivers_peripheral_audio_rich_device", - "drivers_peripheral_audio_community" + "drivers_peripheral_audio_community", + "drivers_peripheral_audio_feature_effect" ], "syscap": [ "" ], "adapter_system_type": ["standard", "small"], diff --git a/audio/effect/BUILD.gn b/audio/effect/BUILD.gn index 068b0d337ad0d5da8d013ac74257c5e0f09bc24b..9b15ef1812da15124963b8ab4fbe25d7c9c4d122 100644 --- a/audio/effect/BUILD.gn +++ b/audio/effect/BUILD.gn @@ -14,7 +14,7 @@ import("//drivers/peripheral/audio/audio.gni") group("effect_model") { - if (!defined(ohos_lite) && !drivers_peripheral_audio_community) { + if (!defined(ohos_lite) && drivers_peripheral_audio_feature_effect) { deps = [ "host:effect_model_service", "model:effect_model_service_1.0", diff --git a/audio/effect/model/src/effect_model.c b/audio/effect/model/src/effect_model.c index 2a8cf041bd62386ed54f1614bec6d68a4ba665f7..bafb3699c3e7635895849f1413f88115137480d3 100644 --- a/audio/effect/model/src/effect_model.c +++ b/audio/effect/model/src/effect_model.c @@ -19,7 +19,7 @@ #include "osal_mem.h" #include "parse_effect_config.h" -#define AUDIO_EFFECT_CONFIG HDF_CONFIG_DIR"/audio_effect.json" +#define AUDIO_EFFECT_CONFIG HDF_CHIP_PROD_CONFIG_DIR"/audio_effect.json" #define HDF_LOG_TAG HDF_AUDIO_EFFECT struct ConfigDescriptor *g_cfgDescs = NULL; diff --git a/audio/effect/test/BUILD.gn b/audio/effect/test/BUILD.gn index fb5af1a9871f1a94c28162b282f5197024cbff1b..9bcc275bdcf6df2c1d02434c2e72aa6254b44e38 100644 --- a/audio/effect/test/BUILD.gn +++ b/audio/effect/test/BUILD.gn @@ -16,7 +16,7 @@ import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") group("effect_test") { - if (!defined(ohos_lite) && !drivers_peripheral_audio_community) { + if (!defined(ohos_lite) && drivers_peripheral_audio_feature_effect) { testonly = true deps = [ "unittest:hdf_effect_hdi_ut" ] } diff --git a/audio/effect/test/unittest/BUILD.gn b/audio/effect/test/unittest/BUILD.gn index 224af4c28b59bed875d369edd7f9a417b2a5d862..e3d7937d68cc8a989f9fd900db4100c280837ff8 100644 --- a/audio/effect/test/unittest/BUILD.gn +++ b/audio/effect/test/unittest/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") ohos_unittest("hdf_effect_hdi_ut") { - module_out_path = "hdf/audio" + module_out_path = "drivers_peripheral_audio/audio" sources = [ "effect_common.cpp", "effect_control_test.cpp",