From 0164a227741f6526ccdcce7ff49666d37b51fedd Mon Sep 17 00:00:00 2001 From: kevios12 Date: Mon, 11 Apr 2022 10:40:18 +0200 Subject: [PATCH] universal7885: vendorsetup: remove FMRadio remove FMRadio. We have our own FMRadio and it will give u an error: "Multiple definiton" --- universal7885-common/vendorsetup.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/universal7885-common/vendorsetup.sh b/universal7885-common/vendorsetup.sh index a731d48..87a24a2 100644 --- a/universal7885-common/vendorsetup.sh +++ b/universal7885-common/vendorsetup.sh @@ -1,3 +1,4 @@ +FM_PATH="packages/apps/FMRadio" rm -rf hardware/samsung if [ -e ~/.git-credentials ]; then MODE="https://" @@ -40,3 +41,8 @@ if grep -q isAudioServerUid\(callingUid\) frameworks/av/services/audioflinger/Au echo "Applying FM routing patch" sed -i 's/isAudioServerUid(callingUid)/isAudioServerOrSystemServerUid(callingUid)/g' frameworks/av/services/audioflinger/AudioFlinger.cpp fi +# Remove multiple declared FMRadio path (we have our own FMRadio and this cause build error) +if [ -d "$FM_PATH" ]; then +echo "Remove FMRadio from ROM Source" +rm -Rf $FM_PATH; +fi