From 36efc06267aa67bc24f64b7369d036a7d679eceb Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Wed, 29 Nov 2023 13:49:21 -0800 Subject: [PATCH] Remove symlink to audio_effects_conf.xsd A change is being made so that sandboxed genrules need to add a dependency on the targets of the symlinks they use. In this case, the symlink isn't necessary, and we can just depend on the audio_effects_conf_V2_0 genrule instead. Bug: 307824623 Test: m audio_effects_conf_V4_0 Change-Id: I6ddaa81e08d7c4a9c29412b11a08f1d6b88689b5 --- audio/effect/4.0/xml/Android.bp | 4 ++-- audio/effect/4.0/xml/audio_effects_conf.xsd | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) delete mode 120000 audio/effect/4.0/xml/audio_effects_conf.xsd diff --git a/audio/effect/4.0/xml/Android.bp b/audio/effect/4.0/xml/Android.bp index 8c03a35fbb..bdffe6065b 100644 --- a/audio/effect/4.0/xml/Android.bp +++ b/audio/effect/4.0/xml/Android.bp @@ -9,9 +9,9 @@ package { 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)", } 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 9d85fa7c68..0000000000 --- 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