From 154df245a55d948f4881deae2d071016e736aef5 Mon Sep 17 00:00:00 2001
From: Adrian DC <radian.dc@gmail.com>
Date: Fri, 18 Aug 2017 16:14:47 +0200
Subject: [PATCH] build: Remove breaking global flags

Change-Id: I9bbc75ce4701dc70c17b1d80c40e8b98e961dd2a
---
 build/core/mtk_target.mk  | 14 --------------
 build/core/qcom_target.mk | 23 -----------------------
 2 files changed, 37 deletions(-)

diff --git a/build/core/mtk_target.mk b/build/core/mtk_target.mk
index 11a7f8c7..576e3833 100644
--- a/build/core/mtk_target.mk
+++ b/build/core/mtk_target.mk
@@ -1,16 +1,2 @@
 # Bring in Mediatek helper macros
 include vendor/lineage/build/core/mtk_utils.mk
-
-ifeq ($(BOARD_USES_MTK_HARDWARE),true)
-    mtk_flags := -DMTK_HARDWARE
-
-    TARGET_GLOBAL_CFLAGS += $(mtk_flags)
-    TARGET_GLOBAL_CPPFLAGS += $(mtk_flags)
-    CLANG_TARGET_GLOBAL_CFLAGS += $(mtk_flags)
-    CLANG_TARGET_GLOBAL_CPPFLAGS += $(mtk_flags)
-
-    2ND_TARGET_GLOBAL_CFLAGS += $(mtk_flags)
-    2ND_TARGET_GLOBAL_CPPFLAGS += $(mtk_flags)
-    2ND_CLANG_TARGET_GLOBAL_CFLAGS += $(mtk_flags)
-    2ND_CLANG_TARGET_GLOBAL_CPPFLAGS += $(mtk_flags)
-endif
diff --git a/build/core/qcom_target.mk b/build/core/qcom_target.mk
index 9bbe252f..ebccff36 100644
--- a/build/core/qcom_target.mk
+++ b/build/core/qcom_target.mk
@@ -30,10 +30,6 @@ ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
     BR_FAMILY := msm8909 msm8916
     UM_FAMILY := msm8937 msm8953
 
-    qcom_flags := -DQCOM_HARDWARE
-    qcom_flags += -DQCOM_BSP
-    qcom_flags += -DQTI_BSP
-
     BOARD_USES_ADRENO := true
 
     TARGET_USES_QCOM_BSP := true
@@ -42,23 +38,15 @@ ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
     TARGET_COMPILE_WITH_MSM_KERNEL := true
 
     ifneq ($(filter msm7x27a msm7x30 msm8660 msm8960,$(TARGET_BOARD_PLATFORM)),)
-        # Enable legacy graphics functions
-        qcom_flags += -DQCOM_BSP_LEGACY
         # Enable legacy audio functions
         ifeq ($(BOARD_USES_LEGACY_ALSA_AUDIO),true)
             USE_CUSTOM_AUDIO_POLICY := 1
-            qcom_flags += -DLEGACY_ALSA_AUDIO
         endif
     endif
 
     # Allow building audio encoders
     TARGET_USES_QCOM_MM_AUDIO := true
 
-    # Enable extra offloading for post-805 targets
-    ifneq ($(filter msm8992 msm8994,$(TARGET_BOARD_PLATFORM)),)
-        qcom_flags += -DHAS_EXTRA_FLAC_METADATA
-    endif
-
     # Enable color metadata for modern UM targets
     ifneq ($(filter msm8996 msm8998 sdm660,$(TARGET_BOARD_PLATFORM)),)
         TARGET_USES_COLOR_METADATA := true
@@ -67,17 +55,6 @@ ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
     # List of targets that use master side content protection
     MASTER_SIDE_CP_TARGET_LIST := msm8996 msm8998 sdm660
 
-    TARGET_GLOBAL_CFLAGS += $(qcom_flags)
-    TARGET_GLOBAL_CPPFLAGS += $(qcom_flags)
-    CLANG_TARGET_GLOBAL_CFLAGS += $(qcom_flags)
-    CLANG_TARGET_GLOBAL_CPPFLAGS += $(qcom_flags)
-
-    # Multiarch needs these too..
-    2ND_TARGET_GLOBAL_CFLAGS += $(qcom_flags)
-    2ND_TARGET_GLOBAL_CPPFLAGS += $(qcom_flags)
-    2ND_CLANG_TARGET_GLOBAL_CFLAGS += $(qcom_flags)
-    2ND_CLANG_TARGET_GLOBAL_CPPFLAGS += $(qcom_flags)
-
     ifeq ($(call is-board-platform-in-list, $(B_FAMILY)),true)
         MSM_VIDC_TARGET_LIST := $(B_FAMILY)
         QCOM_HARDWARE_VARIANT := msm8974