diff options
| author | Mathias Agopian <mathias@google.com> | 2012-03-05 13:57:02 -0800 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2012-03-05 15:59:38 -0800 |
| commit | a1549ff1bf59d6a4c85c92678b45d01757c38b6b (patch) | |
| tree | e7126f008355b63f918d07049d01d5d262b3b4ce /opengl/tests/hwc | |
| parent | 7e5f1e8dc03f163274be1e1bb97f4b05dcc0a510 (diff) | |
| download | frameworks_base-a1549ff1bf59d6a4c85c92678b45d01757c38b6b.zip frameworks_base-a1549ff1bf59d6a4c85c92678b45d01757c38b6b.tar.gz frameworks_base-a1549ff1bf59d6a4c85c92678b45d01757c38b6b.tar.bz2 | |
fixup include paths
- remove unneeded include deps
- remove some hardcoded include paths
Change-Id: Ifae0e2b2d738e0f94f8525c45be78f4227ce1673
Diffstat (limited to 'opengl/tests/hwc')
| -rw-r--r-- | opengl/tests/hwc/Android.mk | 15 | ||||
| -rw-r--r-- | opengl/tests/hwc/hwcCommit.cpp | 2 | ||||
| -rw-r--r-- | opengl/tests/hwc/hwcRects.cpp | 2 | ||||
| -rw-r--r-- | opengl/tests/hwc/hwcStress.cpp | 2 | ||||
| -rw-r--r-- | opengl/tests/hwc/hwcTestLib.cpp | 2 |
5 files changed, 9 insertions, 14 deletions
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 <hardware/hwcomposer.h> #include <glTestLib.h> -#include <hwc/hwcTestLib.h> +#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 <hardware/hwcomposer.h> #include <glTestLib.h> -#include <hwc/hwcTestLib.h> +#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 <hardware/hwcomposer.h> #include <glTestLib.h> -#include <hwc/hwcTestLib.h> +#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 <arpa/inet.h> // For ntohl() and htonl() -#include <hwc/hwcTestLib.h> +#include "hwcTestLib.h" #include "EGLUtils.h" |