From 622cfadc8f0d294f875151fe1d8985e0553795ea Mon Sep 17 00:00:00 2001 From: Mathias Agopian Date: Mon, 5 Mar 2012 13:57:02 -0800 Subject: fixup include paths - remove unneeded include deps - remove some hardcoded include paths Change-Id: Ifae0e2b2d738e0f94f8525c45be78f4227ce1673 --- opengl/tests/angeles/Android.mk | 2 +- opengl/tests/fillrate/Android.mk | 2 +- opengl/tests/filter/Android.mk | 2 +- opengl/tests/finish/Android.mk | 2 +- opengl/tests/gl2_basic/Android.mk | 2 +- opengl/tests/gl2_copyTexImage/Android.mk | 2 +- opengl/tests/gl2_yuvtex/Android.mk | 2 +- opengl/tests/gl_basic/Android.mk | 2 +- opengl/tests/gl_perf/Android.mk | 2 +- opengl/tests/gl_yuvtex/Android.mk | 2 +- opengl/tests/hwc/Android.mk | 15 +++++---------- opengl/tests/hwc/hwcCommit.cpp | 2 +- opengl/tests/hwc/hwcRects.cpp | 2 +- opengl/tests/hwc/hwcStress.cpp | 2 +- opengl/tests/hwc/hwcTestLib.cpp | 2 +- opengl/tests/lib/Android.mk | 2 +- opengl/tests/linetex/Android.mk | 2 +- opengl/tests/swapinterval/Android.mk | 2 +- opengl/tests/textures/Android.mk | 2 +- opengl/tests/tritex/Android.mk | 2 +- services/surfaceflinger/Android.mk | 5 ----- 21 files changed, 24 insertions(+), 34 deletions(-) diff --git a/opengl/tests/angeles/Android.mk b/opengl/tests/angeles/Android.mk index 84b754b..ae4f76d 100644 --- a/opengl/tests/angeles/Android.mk +++ b/opengl/tests/angeles/Android.mk @@ -4,7 +4,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES:= app-linux.cpp demo.c.arm LOCAL_SHARED_LIBRARIES := libEGL libGLESv1_CM libui -LOCAL_C_INCLUDES += frameworks/base/opengl/tests/include +LOCAL_C_INCLUDES += $(call include-path-for, opengl-tests-includes) LOCAL_MODULE:= angeles LOCAL_MODULE_TAGS := optional include $(BUILD_EXECUTABLE) diff --git a/opengl/tests/fillrate/Android.mk b/opengl/tests/fillrate/Android.mk index 835f858..4dade21 100644 --- a/opengl/tests/fillrate/Android.mk +++ b/opengl/tests/fillrate/Android.mk @@ -11,7 +11,7 @@ LOCAL_SHARED_LIBRARIES := \ libGLESv1_CM \ libui -LOCAL_C_INCLUDES += frameworks/base/opengl/tests/include +LOCAL_C_INCLUDES += $(call include-path-for, opengl-tests-includes) LOCAL_MODULE:= test-opengl-fillrate diff --git a/opengl/tests/filter/Android.mk b/opengl/tests/filter/Android.mk index d780362..d3e4d38 100644 --- a/opengl/tests/filter/Android.mk +++ b/opengl/tests/filter/Android.mk @@ -10,7 +10,7 @@ LOCAL_SHARED_LIBRARIES := \ libGLESv1_CM \ libui -LOCAL_C_INCLUDES += frameworks/base/opengl/tests/include +LOCAL_C_INCLUDES += $(call include-path-for, opengl-tests-includes) LOCAL_MODULE:= test-opengl-filter diff --git a/opengl/tests/finish/Android.mk b/opengl/tests/finish/Android.mk index 8f4f9c3..aa8adca 100644 --- a/opengl/tests/finish/Android.mk +++ b/opengl/tests/finish/Android.mk @@ -11,7 +11,7 @@ LOCAL_SHARED_LIBRARIES := \ libGLESv1_CM \ libui -LOCAL_C_INCLUDES += frameworks/base/opengl/tests/include +LOCAL_C_INCLUDES += $(call include-path-for, opengl-tests-includes) LOCAL_MODULE:= test-opengl-finish diff --git a/opengl/tests/gl2_basic/Android.mk b/opengl/tests/gl2_basic/Android.mk index 07469a0..d7819a1 100644 --- a/opengl/tests/gl2_basic/Android.mk +++ b/opengl/tests/gl2_basic/Android.mk @@ -10,7 +10,7 @@ LOCAL_SHARED_LIBRARIES := \ libGLESv2 \ libui -LOCAL_C_INCLUDES += frameworks/base/opengl/tests/include +LOCAL_C_INCLUDES += $(call include-path-for, opengl-tests-includes) LOCAL_MODULE:= test-opengl-gl2_basic diff --git a/opengl/tests/gl2_copyTexImage/Android.mk b/opengl/tests/gl2_copyTexImage/Android.mk index b616428..005c383 100644 --- a/opengl/tests/gl2_copyTexImage/Android.mk +++ b/opengl/tests/gl2_copyTexImage/Android.mk @@ -10,7 +10,7 @@ LOCAL_SHARED_LIBRARIES := \ libGLESv2 \ libui -LOCAL_C_INCLUDES += frameworks/base/opengl/tests/include +LOCAL_C_INCLUDES += $(call include-path-for, opengl-tests-includes) LOCAL_MODULE:= test-opengl-gl2_copyTexImage diff --git a/opengl/tests/gl2_yuvtex/Android.mk b/opengl/tests/gl2_yuvtex/Android.mk index e36f319..7d43759 100644 --- a/opengl/tests/gl2_yuvtex/Android.mk +++ b/opengl/tests/gl2_yuvtex/Android.mk @@ -10,7 +10,7 @@ LOCAL_SHARED_LIBRARIES := \ libGLESv2 \ libui -LOCAL_C_INCLUDES += frameworks/base/opengl/tests/include +LOCAL_C_INCLUDES += $(call include-path-for, opengl-tests-includes) LOCAL_MODULE:= test-opengl-gl2_yuvtex diff --git a/opengl/tests/gl_basic/Android.mk b/opengl/tests/gl_basic/Android.mk index 2ba327b..46bcc60 100644 --- a/opengl/tests/gl_basic/Android.mk +++ b/opengl/tests/gl_basic/Android.mk @@ -10,7 +10,7 @@ LOCAL_SHARED_LIBRARIES := \ libGLESv1_CM \ libui -LOCAL_C_INCLUDES += frameworks/base/opengl/tests/include +LOCAL_C_INCLUDES += $(call include-path-for, opengl-tests-includes) LOCAL_MODULE:= test-opengl-gl_basic diff --git a/opengl/tests/gl_perf/Android.mk b/opengl/tests/gl_perf/Android.mk index f32abd3..cfca089 100644 --- a/opengl/tests/gl_perf/Android.mk +++ b/opengl/tests/gl_perf/Android.mk @@ -11,7 +11,7 @@ LOCAL_SHARED_LIBRARIES := \ libGLESv2 \ libui -LOCAL_C_INCLUDES += frameworks/base/opengl/tests/include +LOCAL_C_INCLUDES += $(call include-path-for, opengl-tests-includes) LOCAL_MODULE:= test-opengl-gl2_perf diff --git a/opengl/tests/gl_yuvtex/Android.mk b/opengl/tests/gl_yuvtex/Android.mk index 5b87f2e..9e5dba0 100644 --- a/opengl/tests/gl_yuvtex/Android.mk +++ b/opengl/tests/gl_yuvtex/Android.mk @@ -10,7 +10,7 @@ LOCAL_SHARED_LIBRARIES := \ libGLESv1_CM \ libui -LOCAL_C_INCLUDES += frameworks/base/opengl/tests/include +LOCAL_C_INCLUDES += $(call include-path-for, opengl-tests-includes) LOCAL_MODULE:= test-opengl-gl_yuvtex diff --git a/opengl/tests/hwc/Android.mk b/opengl/tests/hwc/Android.mk index e4d7e28..9eb58b1 100644 --- a/opengl/tests/hwc/Android.mk +++ b/opengl/tests/hwc/Android.mk @@ -22,8 +22,7 @@ LOCAL_C_INCLUDES += system/extras/tests/include \ bionic \ bionic/libstdc++/include \ external/stlport/stlport \ - frameworks/base/opengl/tests \ - frameworks/base/opengl/tests/include \ + $(call include-path-for, opengl-tests-includes) LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES @@ -51,8 +50,7 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_C_INCLUDES += \ system/extras/tests/include \ hardware/libhardware/include \ - frameworks/base/opengl/tests \ - frameworks/base/opengl/tests/include \ + $(call include-path-for, opengl-tests-includes) LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES @@ -83,8 +81,7 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_C_INCLUDES += \ system/extras/tests/include \ hardware/libhardware/include \ - frameworks/base/opengl/tests \ - frameworks/base/opengl/tests/include \ + $(call include-path-for, opengl-tests-includes) LOCAL_MODULE:= hwcRects LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/nativeutil @@ -113,8 +110,7 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_C_INCLUDES += \ system/extras/tests/include \ hardware/libhardware/include \ - frameworks/base/opengl/tests \ - frameworks/base/opengl/tests/include \ + $(call include-path-for, opengl-tests-includes) LOCAL_MODULE:= hwcColorEquiv LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/nativeutil @@ -143,8 +139,7 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_C_INCLUDES += \ system/extras/tests/include \ hardware/libhardware/include \ - frameworks/base/opengl/tests \ - frameworks/base/opengl/tests/include \ + $(call include-path-for, opengl-tests-includes) LOCAL_MODULE:= hwcCommit LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/nativebenchmark diff --git a/opengl/tests/hwc/hwcCommit.cpp b/opengl/tests/hwc/hwcCommit.cpp index 685dc5d..efa646c 100644 --- a/opengl/tests/hwc/hwcCommit.cpp +++ b/opengl/tests/hwc/hwcCommit.cpp @@ -106,7 +106,7 @@ #include #include -#include +#include "hwcTestLib.h" using namespace std; using namespace android; diff --git a/opengl/tests/hwc/hwcRects.cpp b/opengl/tests/hwc/hwcRects.cpp index 80cde23..906c169 100644 --- a/opengl/tests/hwc/hwcRects.cpp +++ b/opengl/tests/hwc/hwcRects.cpp @@ -114,7 +114,7 @@ #include #include -#include +#include "hwcTestLib.h" using namespace std; using namespace android; diff --git a/opengl/tests/hwc/hwcStress.cpp b/opengl/tests/hwc/hwcStress.cpp index 7d7bc1f..b02a424 100644 --- a/opengl/tests/hwc/hwcStress.cpp +++ b/opengl/tests/hwc/hwcStress.cpp @@ -111,7 +111,7 @@ #include #include -#include +#include "hwcTestLib.h" using namespace std; using namespace android; diff --git a/opengl/tests/hwc/hwcTestLib.cpp b/opengl/tests/hwc/hwcTestLib.cpp index 63f42ba..28e0c3f 100644 --- a/opengl/tests/hwc/hwcTestLib.cpp +++ b/opengl/tests/hwc/hwcTestLib.cpp @@ -25,7 +25,7 @@ #include // For ntohl() and htonl() -#include +#include "hwcTestLib.h" #include "EGLUtils.h" diff --git a/opengl/tests/lib/Android.mk b/opengl/tests/lib/Android.mk index ac1e183..0352a37 100644 --- a/opengl/tests/lib/Android.mk +++ b/opengl/tests/lib/Android.mk @@ -22,7 +22,7 @@ LOCAL_C_INCLUDES += system/extras/tests/include \ bionic \ bionic/libstdc++/include \ external/stlport/stlport \ - frameworks/base/opengl/tests/include \ + $(call include-path-for, opengl-tests-includes) LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES diff --git a/opengl/tests/linetex/Android.mk b/opengl/tests/linetex/Android.mk index 261940e..5b6384e 100644 --- a/opengl/tests/linetex/Android.mk +++ b/opengl/tests/linetex/Android.mk @@ -10,7 +10,7 @@ LOCAL_SHARED_LIBRARIES := \ libGLESv1_CM \ libui -LOCAL_C_INCLUDES += frameworks/base/opengl/tests/include +LOCAL_C_INCLUDES += $(call include-path-for, opengl-tests-includes) LOCAL_MODULE:= test-opengl-linetex diff --git a/opengl/tests/swapinterval/Android.mk b/opengl/tests/swapinterval/Android.mk index d014cc9..5517f60 100644 --- a/opengl/tests/swapinterval/Android.mk +++ b/opengl/tests/swapinterval/Android.mk @@ -11,7 +11,7 @@ LOCAL_SHARED_LIBRARIES := \ libGLESv1_CM \ libui -LOCAL_C_INCLUDES += frameworks/base/opengl/tests/include +LOCAL_C_INCLUDES += $(call include-path-for, opengl-tests-includes) LOCAL_MODULE:= test-opengl-swapinterval diff --git a/opengl/tests/textures/Android.mk b/opengl/tests/textures/Android.mk index fe9f43c..97697d7 100644 --- a/opengl/tests/textures/Android.mk +++ b/opengl/tests/textures/Android.mk @@ -10,7 +10,7 @@ LOCAL_SHARED_LIBRARIES := \ libGLESv1_CM \ libui -LOCAL_C_INCLUDES += frameworks/base/opengl/tests/include +LOCAL_C_INCLUDES += $(call include-path-for, opengl-tests-includes) LOCAL_MODULE:= test-opengl-textures diff --git a/opengl/tests/tritex/Android.mk b/opengl/tests/tritex/Android.mk index fc544e4..89faa87 100644 --- a/opengl/tests/tritex/Android.mk +++ b/opengl/tests/tritex/Android.mk @@ -10,7 +10,7 @@ LOCAL_SHARED_LIBRARIES := \ libGLESv1_CM \ libui -LOCAL_C_INCLUDES += frameworks/base/opengl/tests/include +LOCAL_C_INCLUDES += $(call include-path-for, opengl-tests-includes) LOCAL_MODULE:= test-opengl-tritex diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk index 42e280f..aa1e426 100644 --- a/services/surfaceflinger/Android.mk +++ b/services/surfaceflinger/Android.mk @@ -51,11 +51,6 @@ LOCAL_SHARED_LIBRARIES := \ # this is only needed for DDMS debugging LOCAL_SHARED_LIBRARIES += libdvm libandroid_runtime -LOCAL_C_INCLUDES := \ - $(call include-path-for, corecg graphics) - -LOCAL_C_INCLUDES += hardware/libhardware/modules/gralloc - LOCAL_MODULE:= libsurfaceflinger include $(BUILD_SHARED_LIBRARY) -- cgit v1.1