gator-driver: Revert commit 61fdde50 (Hack makefile to search for Mali trace headers)
authorJon Medhurst <tixy@linaro.org>
Wed, 14 Mar 2012 09:26:21 +0000 (09:26 +0000)
committerJon Medhurst <tixy@linaro.org>
Wed, 14 Mar 2012 09:26:21 +0000 (09:26 +0000)
The hack for Ubuntu breaks Android builds because EXTRA_CFLAGS doesn't
work in Android and so the include path isn't extended to find
mali_linux_trace.h; therefore, revert this change in Android branch.

Note, Android has a clean way to build Gator with Mali support, so we
have no need of the hack anyway, see:
http://review.android.git.linaro.org/#change,1549

Signed-off-by: Jon Medhurst <tixy@linaro.org>
driver/Makefile

index 8824f8e602ff09448b40705c48b691e9753b8152..e521b9915dc29af938c75c0878167e82c8f0980d 100644 (file)
@@ -16,16 +16,6 @@ gator-y :=   gator_main.o \
 
 gator-y +=     gator_events_mmaped.o
 
-ifeq ($(GATOR_WITH_MALI_SUPPORT),)
-ifeq ($(GATOR_MALI_INCLUDE),)
-GATOR_MALI_INCLUDE = $(abspath $(shell find -L . -name "mali_linux_trace.h" | sed -n -e '1s,\(.*\)/linux/mali_linux_trace.h$$,\1,p'))
-endif
-ifneq ($(GATOR_MALI_INCLUDE),)
-GATOR_WITH_MALI_SUPPORT = MALI_400  # for now, assume all devices with Mali have the Mali-400
-EXTRA_CFLAGS +=        -I$(GATOR_MALI_INCLUDE)
-endif
-endif
-
 ifneq ($(GATOR_WITH_MALI_SUPPORT),)
 ifeq ($(GATOR_WITH_MALI_SUPPORT),MALI_T6xx)
 gator-y +=     gator_events_mali_t6xx.o