From f9dd04853679d8a9794803e64cc2f4b2e4c6f175 Mon Sep 17 00:00:00 2001
From: sulav <sulav.mulmi@huawei.com>
Date: Tue, 27 Jul 2021 19:59:05 +0530
Subject: [PATCH] Fix ISO declaration order for musl build

Signed-off-by: sulav <sulav.mulmi@huawei.com>
---
 .../audiopolicy/1.0/src/audio_policy_test.cpp        | 12 ++++++------
 services/etc/pulseaudio.cfg                          |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/frameworks/innerkitsimpl/test/moduletest/audiopolicy/1.0/src/audio_policy_test.cpp b/frameworks/innerkitsimpl/test/moduletest/audiopolicy/1.0/src/audio_policy_test.cpp
index 2bf1c97aec..f2d5fb8efa 100644
--- a/frameworks/innerkitsimpl/test/moduletest/audiopolicy/1.0/src/audio_policy_test.cpp
+++ b/frameworks/innerkitsimpl/test/moduletest/audiopolicy/1.0/src/audio_policy_test.cpp
@@ -37,12 +37,12 @@ void AudioPolicyTest::TearDown(void) {}
 namespace {
 const PolicyParam VOLUME_PARAMS[] = {
     {
-        .streamType = STREAM_MUSIC,
-        .volume = 0.5
+        .volume = 0.5,
+        .streamType = STREAM_MUSIC
     },
     {
-        .streamType = STREAM_RING,
-        .volume = 0.5
+        .volume = 0.5,
+        .streamType = STREAM_RING
     }
 };
 
@@ -158,13 +158,13 @@ const PolicyParam AUDIO_PARAMS[] = {
 
 const PolicyParam DEVICES_PARAMS[] = {
     {
-        .deviceFlag = AudioDeviceDescriptor::DeviceFlag::INPUT_DEVICES_FLAG,
         .deviceType = MIC,
+        .deviceFlag = AudioDeviceDescriptor::DeviceFlag::INPUT_DEVICES_FLAG,
         .deviceRole = AudioDeviceDescriptor::DeviceRole::INPUT_DEVICE
     },
     {
-        .deviceFlag = AudioDeviceDescriptor::DeviceFlag::OUTPUT_DEVICES_FLAG,
         .deviceType = SPEAKER,
+        .deviceFlag = AudioDeviceDescriptor::DeviceFlag::OUTPUT_DEVICES_FLAG,
         .deviceRole = AudioDeviceDescriptor::DeviceRole::OUTPUT_DEVICE
     }
 };
diff --git a/services/etc/pulseaudio.cfg b/services/etc/pulseaudio.cfg
index 6f8a01137a..d444809b53 100644
--- a/services/etc/pulseaudio.cfg
+++ b/services/etc/pulseaudio.cfg
@@ -5,8 +5,8 @@
                 "mkdir /data/local/.pulse_dir",
                 "chmod 755 /data/local/.pulse_dir",
                 "chown system shell /data/local/.pulse_dir",
-                "export PULSE_STATE_PATH \"/data/local/.pulse_dir\"",
-                "export PULSE_RUNTIME_PATH \"/data/local/.pulse_dir\"",
+                "export PULSE_STATE_PATH /data/local/.pulse_dir",
+                "export PULSE_RUNTIME_PATH /data/local/.pulse_dir",
                 "start pulseaudio",
                 "exec /system/bin/sleep 4",
                 "trigger audio_policy_start"
-- 
Gitee