commit e2912b9c83329b29a93e3ee61f464c21e307a2a1
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Nov 30 03:15:48 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Nov 30 03:15:48 2023 +0000
tree 56692356db0e0c103fdea143d73d4ef68b0d79bd
parent cc1365ffec024fb9f9fb5223ba7db7e6c9525866
parent f75750965f36985365081e37ed57b717c1a1502a

Merge "Remove symlink to audio_effects_conf.xsd" into main am: f75750965f

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2853029

Change-Id: I1da99bc70377ee3dd00eed40f5494aa7c47883df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

audio/effect/4.0/xml/Android.bp

diff --git a/audio/effect/4.0/xml/Android.bp b/audio/effect/4.0/xml/Android.bp
index 8c03a35..bdffe60 100644
--- a/audio/effect/4.0/xml/Android.bp
+++ b/audio/effect/4.0/xml/Android.bp
@@ -9,9 +9,9 @@
 
 genrule {
     name: "audio_effects_conf_V4_0",
-    srcs: ["audio_effects_conf.xsd"],
+    srcs: [":audio_effects_conf_V2_0"],
     out: [
         "audio_effects_conf_V4_0.xsd",
     ],
-    cmd: "cp -f $(in) $(genDir)/audio_effects_conf_V4_0.xsd",
+    cmd: "cp -f $(in) $(out)",
 }

audio/effect/4.0/xml/audio_effects_conf.xsd

diff --git a/audio/effect/4.0/xml/audio_effects_conf.xsd b/audio/effect/4.0/xml/audio_effects_conf.xsd
deleted file mode 120000
index 9d85fa7..0000000
--- a/audio/effect/4.0/xml/audio_effects_conf.xsd
+++ /dev/null
@@ -1 +0,0 @@
-../../2.0/xml/audio_effects_conf.xsd
\ No newline at end of file