f/b: qcom flags cleanup

Change-Id: Id4da5e2038cf5c9ba540a812281daa4a1b9af03a

16 files changed, 0 insertions, 56 deletions

diff --git a/cmds/stagefright/Android.mk b/cmds/stagefright/Android.mk
index 172f060..8c0561b 100644
--- a/cmds/stagefright/Android.mk
+++ b/cmds/stagefright/Android.mk
@@ -24,7 +24,6 @@ LOCAL_MODULE_TAGS := debug
 
 ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
 	LOCAL_C_INCLUDES += $(TOP)/vendor/qcom/opensource/omx/mm-core/omxcore/inc
-	LOCAL_CFLAGS += -DQCOM_HARDWARE
 endif
 
 LOCAL_MODULE:= stagefright
@@ -51,10 +50,6 @@ LOCAL_CFLAGS += -Wno-multichar
 
 LOCAL_MODULE_TAGS := debug
 
-ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
-	LOCAL_CFLAGS += -DQCOM_HARDWARE
-endif
-
 LOCAL_MODULE:= record
 
 include $(BUILD_EXECUTABLE)
@@ -81,7 +76,6 @@ LOCAL_MODULE_TAGS := debug
 
 ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
 	LOCAL_C_INCLUDES += $(TOP)/vendor/qcom/opensource/omx/mm-core/omxcore/inc
-	LOCAL_CFLAGS += -DQCOM_HARDWARE
 endif
 
 LOCAL_MODULE:= recordvideo
@@ -109,10 +103,6 @@ LOCAL_CFLAGS += -Wno-multichar
 
 LOCAL_MODULE_TAGS := debug
 
-ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
-	LOCAL_CFLAGS += -DQCOM_HARDWARE
-endif
-
 LOCAL_MODULE:= audioloop
 
 include $(BUILD_EXECUTABLE)
@@ -139,7 +129,6 @@ LOCAL_MODULE_TAGS := debug
 
 ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
 	LOCAL_C_INCLUDES += $(TOP)/vendor/qcom/opensource/omx/mm-core/omxcore/inc
-	LOCAL_CFLAGS += -DQCOM_HARDWARE
 endif
 
 LOCAL_MODULE:= stream
@@ -168,7 +157,6 @@ LOCAL_MODULE_TAGS := debug
 
 ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
 	LOCAL_C_INCLUDES += $(TOP)/vendor/qcom/opensource/omx/mm-core/omxcore/inc
-	LOCAL_CFLAGS += -DQCOM_HARDWARE
 endif
 
 LOCAL_MODULE:= sf2
diff --git a/cmds/surfaceflinger/Android.mk b/cmds/surfaceflinger/Android.mk
index 20b02fa..56606fc 100644
--- a/cmds/surfaceflinger/Android.mk
+++ b/cmds/surfaceflinger/Android.mk
@@ -14,7 +14,6 @@ LOCAL_C_INCLUDES := \
 
 ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
 LOCAL_C_INCLUDES +=  hardware/qcom/display/libqcomui
-LOCAL_CFLAGS += -DQCOM_HARDWARE
 endif
 
 LOCAL_MODULE:= surfaceflinger
diff --git a/cmds/system_server/library/Android.mk b/cmds/system_server/library/Android.mk
index cd5ee56..0596e89 100644
--- a/cmds/system_server/library/Android.mk
+++ b/cmds/system_server/library/Android.mk
@@ -16,7 +16,6 @@ LOCAL_C_INCLUDES := \
 
 ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
 LOCAL_C_INCLUDES +=  hardware/qcom/display/libqcomui
-LOCAL_CFLAGS += -DQCOM_HARDWARE
 endif
 
 LOCAL_SHARED_LIBRARIES := \
diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index 3902a64..8b2f0c4 100755
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -158,7 +158,6 @@ LOCAL_SRC_FILES:= \
         android_animation_PropertyValuesHolder.cpp
 
 ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
-        LOCAL_CFLAGS += -DQCOM_HARDWARE
 	LOCAL_SRC_FILES += org_codeaurora_Performance.cpp
 endif
 
@@ -232,7 +231,6 @@ ifeq ($(USE_OPENGL_RENDERER),true)
 LOCAL_SHARED_LIBRARIES += libtilerenderer
 endif
 LOCAL_C_INCLUDES += hardware/qcom/display/libtilerenderer
-LOCAL_CFLAGS += -DQCOM_HARDWARE
 endif
 
 ifeq ($(BOARD_HAVE_BLUETOOTH),true)
diff --git a/libs/camera/Android.mk b/libs/camera/Android.mk
index da956ea..7286f92 100644
--- a/libs/camera/Android.mk
+++ b/libs/camera/Android.mk
@@ -18,11 +18,6 @@ LOCAL_SHARED_LIBRARIES := \
 	libui \
 	libgui
 
-ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
-	LOCAL_CFLAGS += -DQCOM_HARDWARE
-endif
-
-
 LOCAL_MODULE:= libcamera_client
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/libs/gui/Android.mk b/libs/gui/Android.mk
index 050b933..aeff66e 100644
--- a/libs/gui/Android.mk
+++ b/libs/gui/Android.mk
@@ -33,7 +33,6 @@ ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
 LOCAL_SHARED_LIBRARIES += \
         libQcomUI
 LOCAL_C_INCLUDES := hardware/qcom/display/libqcomui
-LOCAL_CFLAGS += -DQCOM_HARDWARE
 ifeq ($(TARGET_QCOM_HDMI_OUT),true)
 LOCAL_CFLAGS += -DQCOM_HDMI_OUT
 endif
diff --git a/libs/hwui/Android.mk b/libs/hwui/Android.mk
index 1d9f1f9..40708f9 100644
--- a/libs/hwui/Android.mk
+++ b/libs/hwui/Android.mk
@@ -43,9 +43,6 @@ ifeq ($(USE_OPENGL_RENDERER),true)
 	LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 	LOCAL_SHARED_LIBRARIES := libcutils libutils libGLESv2 libskia libui
 
-ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
-LOCAL_CFLAGS += -DQCOM_HARDWARE
-endif
 	LOCAL_MODULE := libhwui
 	LOCAL_MODULE_TAGS := optional
 	
diff --git a/libs/rs/Android.mk b/libs/rs/Android.mk
index c77b155..58d3e5c 100644
--- a/libs/rs/Android.mk
+++ b/libs/rs/Android.mk
@@ -137,10 +137,6 @@ LOCAL_C_INCLUDES += frameworks/compile/libbcc/include
 
 LOCAL_CFLAGS += -Werror -Wall -Wno-unused-parameter -Wno-unused-variable
 
-ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
-    LOCAL_CFLAGS += -DQCOM_HARDWARE
-endif
-
 LOCAL_LDLIBS := -lpthread -ldl
 LOCAL_MODULE:= libRS
 LOCAL_MODULE_TAGS := optional
diff --git a/libs/ui/Android.mk b/libs/ui/Android.mk
index 25f68f3..fbabfc4 100644
--- a/libs/ui/Android.mk
+++ b/libs/ui/Android.mk
@@ -66,10 +66,6 @@ LOCAL_SHARED_LIBRARIES := \
 LOCAL_C_INCLUDES := \
     external/skia/include/core
 
-ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
-LOCAL_CFLAGS += -DQCOM_HARDWARE
-endif
-
 LOCAL_MODULE:= libui
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk
index cc54ba0..15f3c13 100644
--- a/media/libmedia/Android.mk
+++ b/media/libmedia/Android.mk
@@ -5,11 +5,6 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES:= \
     AudioParameter.cpp
 
-ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
-    LOCAL_CFLAGS += -DQCOM_HARDWARE
-endif
-
-
 LOCAL_MODULE:= libmedia_helper
 LOCAL_MODULE_TAGS := optional
 
@@ -52,10 +47,6 @@ LOCAL_SRC_FILES:= \
     MemoryLeakTrackUtil.cpp \
     fixedfft.cpp.arm
 
-ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
-    LOCAL_CFLAGS += -DQCOM_HARDWARE
-endif
-
 ifeq ($(BOARD_USES_AUDIO_LEGACY),true)
     LOCAL_SRC_FILES+= \
         AudioParameter.cpp
diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk
index 215b6a5..a975613 100644
--- a/media/libmediaplayerservice/Android.mk
+++ b/media/libmediaplayerservice/Android.mk
@@ -43,10 +43,6 @@ LOCAL_C_INCLUDES :=                                                 \
 	$(TOP)/frameworks/base/media/libstagefright/rtsp                \
 	$(TOP)/external/tremolo/Tremolo \
 
-ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
-	LOCAL_CFLAGS += -DQCOM_HARDWARE
-endif
-
 LOCAL_MODULE:= libmediaplayerservice
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk
index 44db3ce..ed63d5d 100644
--- a/media/libstagefright/Android.mk
+++ b/media/libstagefright/Android.mk
@@ -188,7 +188,6 @@ ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
         LOCAL_C_INCLUDES += $(TOP)/vendor/qcom/opensource/omx/mm-core/omxcore/inc
         LOCAL_C_INCLUDES += $(TOP)/system/core/include
         LOCAL_C_INCLUDES += $(TOP)/hardware/libhardware_legacy/include
-        LOCAL_CFLAGS += -DQCOM_HARDWARE
 endif
 
 LOCAL_MODULE:= libstagefright
diff --git a/media/libstagefright/colorconversion/Android.mk b/media/libstagefright/colorconversion/Android.mk
index d62eda4..f62665e 100644
--- a/media/libstagefright/colorconversion/Android.mk
+++ b/media/libstagefright/colorconversion/Android.mk
@@ -11,7 +11,6 @@ LOCAL_C_INCLUDES := \
 
 ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
         LOCAL_C_INCLUDES += $(TOP)/vendor/qcom/opensource/omx/mm-core/omxcore/inc
-        LOCAL_CFLAGS += -DQCOM_HARDWARE
 endif
 
 LOCAL_MODULE:= libstagefright_color_conversion
diff --git a/opengl/libagl/Android.mk b/opengl/libagl/Android.mk
index 33ecbe8..ce55093 100644
--- a/opengl/libagl/Android.mk
+++ b/opengl/libagl/Android.mk
@@ -47,9 +47,6 @@ endif
 ifeq ($(TARGET_HAVE_TEGRA_ERRATA_657451),true)
     LOCAL_CFLAGS += -DHAVE_TEGRA_ERRATA_657451
 endif
-ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
-    LOCAL_CFLAGS += -DQCOM_HARDWARE
-endif
 LOCAL_C_INCLUDES += bionic/libc/private
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl
diff --git a/opengl/libs/Android.mk b/opengl/libs/Android.mk
index f18c3b6..26f2ba4 100644
--- a/opengl/libs/Android.mk
+++ b/opengl/libs/Android.mk
@@ -54,10 +54,6 @@ ifneq ($(MAX_EGL_CACHE_SIZE),)
   LOCAL_CFLAGS += -DMAX_EGL_CACHE_SIZE=$(MAX_EGL_CACHE_SIZE)
 endif
 
-ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
-    LOCAL_CFLAGS += -DQCOM_HARDWARE
-endif
-
 include $(BUILD_SHARED_LIBRARY)
 installed_libEGL := $(LOCAL_INSTALLED_MODULE)
 
diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk
index f7922c5..5d2ac8f 100644
--- a/services/surfaceflinger/Android.mk
+++ b/services/surfaceflinger/Android.mk
@@ -68,7 +68,6 @@ endif
 LOCAL_SHARED_LIBRARIES += \
 	libQcomUI
 LOCAL_C_INCLUDES += hardware/qcom/display/libqcomui
-LOCAL_CFLAGS += -DQCOM_HARDWARE
 ifeq ($(TARGET_QCOM_HDMI_OUT),true)
 LOCAL_CFLAGS += -DQCOM_HDMI_OUT
 endif