ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

fixup include paths

Browse Source 
- remove unneeded include deps
- remove some hardcoded include paths

Change-Id: Ifae0e2b2d738e0f94f8525c45be78f4227ce1673
This commit is contained in:
Mathias Agopian 2012-03-05 13:57:02 -08:00
parent 06b573e4f9
commit 622cfadc8f
21 changed files with 24 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opengl/tests/angeles/Android.mk
View File

@ -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)

2
opengl/tests/fillrate/Android.mk
View File

@ -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

2
opengl/tests/filter/Android.mk
View File

@ -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

2
opengl/tests/finish/Android.mk
View File

@ -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

2
opengl/tests/gl2_basic/Android.mk
View File

@ -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

2
opengl/tests/gl2_copyTexImage/Android.mk
View File

@ -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

2
opengl/tests/gl2_yuvtex/Android.mk
View File

@ -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

2
opengl/tests/gl_basic/Android.mk
View File

@ -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

2
opengl/tests/gl_perf/Android.mk
View File

@ -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

2
opengl/tests/gl_yuvtex/Android.mk
View File

@ -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

15
opengl/tests/hwc/Android.mk
View File

@ -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

2
opengl/tests/hwc/hwcCommit.cpp
View File

@ -106,7 +106,7 @@
#include <hardware/hwcomposer.h>
#include <glTestLib.h>
#include <hwc/hwcTestLib.h>
#include "hwcTestLib.h"
using namespace std;
using namespace android;

2
opengl/tests/hwc/hwcRects.cpp
View File

@ -114,7 +114,7 @@
#include <hardware/hwcomposer.h>
#include <glTestLib.h>
#include <hwc/hwcTestLib.h>
#include "hwcTestLib.h"
using namespace std;
using namespace android;

2
opengl/tests/hwc/hwcStress.cpp
View File

@ -111,7 +111,7 @@
#include <hardware/hwcomposer.h>
#include <glTestLib.h>
#include <hwc/hwcTestLib.h>
#include "hwcTestLib.h"
using namespace std;
using namespace android;

2
opengl/tests/hwc/hwcTestLib.cpp
View File

@ -25,7 +25,7 @@
#include <arpa/inet.h> // For ntohl() and htonl()
#include <hwc/hwcTestLib.h>
#include "hwcTestLib.h"
#include "EGLUtils.h"

2
opengl/tests/lib/Android.mk
View File

@ -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

2
opengl/tests/linetex/Android.mk
View File

@ -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

2
opengl/tests/swapinterval/Android.mk
View File

@ -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

2
opengl/tests/textures/Android.mk
View File

@ -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

2
opengl/tests/tritex/Android.mk
View File

@ -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

5
services/surfaceflinger/Android.mk
View File

@ -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)