Remove usages of USE_XML_AUDIO_POLICY_CONF

The usages were only checking that the property is set
to catch attempts to update to Q while still using legacy
configurations.

Bug: 132435217
Test: build various devices
Change-Id: Ib8bda8ab7f791ac5cd3875816de46a42f0a4cbb6
Merged-In: Ib8bda8ab7f791ac5cd3875816de46a42f0a4cbb6

services/audiopolicy/managerdefault/Android.mk

@@ -15,10 +15,6 @@ LOCAL_SHARED_LIBRARIES := \
 
 ifeq ($(USE_CONFIGURABLE_AUDIO_POLICY), 1)
 
-ifneq ($(USE_XML_AUDIO_POLICY_CONF), 1)
-$(error Configurable policy does not support legacy conf file)
-endif #ifneq ($(USE_XML_AUDIO_POLICY_CONF), 1)
-
 LOCAL_SHARED_LIBRARIES += libaudiopolicyengineconfigurable
 
 else
@@ -43,10 +39,6 @@ LOCAL_SHARED_LIBRARIES += libmediametrics
 
 LOCAL_SHARED_LIBRARIES += libbinder libhidlbase libxml2
 
-ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)
-LOCAL_CFLAGS += -DUSE_XML_AUDIO_POLICY_CONF
-endif #ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)
-
 LOCAL_CFLAGS += -Wall -Werror
 
 LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

@@ -4297,14 +4297,6 @@ AudioPolicyManager::AudioPolicyManager(AudioPolicyClientInterface *clientInterfa
     initialize();
 }
 
-//  This check is to catch any legacy platform updating to Q without having
-//  switched to XML since its deprecation on O.
-// TODO: after Q release, remove this check and flag as XML is now the only
-//        option and all legacy platform should have transitioned to XML.
-#ifndef USE_XML_AUDIO_POLICY_CONF
-#error Audio policy no longer supports legacy .conf configuration format
-#endif
-
 void AudioPolicyManager::loadConfig() {
     if (deserializeAudioPolicyXmlConfig(getConfig()) != NO_ERROR) {
         ALOGE("could not load audio policy configuration file, setting defaults");