summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2009-01-15 16:12:14 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2009-01-15 16:12:14 -0800
commit1d68e595e72f955a8cd12f59825943ea71daf7d5 (patch)
treed258de5274e884d9a4cf0a5d94c35c73a83bbc1b
parentab8beedeb70c6941e0ff68014d8db64cee4ef15d (diff)
downloadextras-1d68e595e72f955a8cd12f59825943ea71daf7d5.tar.gz
auto import from //branches/cupcake/...@126645
-rw-r--r--tests/bionic/libc/other/test_jpeg.c2
-rw-r--r--tests/cpueater/Android.mk2
-rw-r--r--tests/cpueater/daemonize.c2
-rw-r--r--tests/memtest/Android.mk1
-rw-r--r--timeinfo/Android.mk2
5 files changed, 4 insertions, 5 deletions
diff --git a/tests/bionic/libc/other/test_jpeg.c b/tests/bionic/libc/other/test_jpeg.c
index 8d7ef1a7..f481b9a3 100644
--- a/tests/bionic/libc/other/test_jpeg.c
+++ b/tests/bionic/libc/other/test_jpeg.c
@@ -39,7 +39,7 @@
#include "jpeglib.h"
#include <setjmp.h>
#ifdef HAVE_ANDROID_OS
-#include <hardware/qemu_tracing.h>
+#include <hardware_legacy/qemu_tracing.h>
#endif
#define USE_STDIO
diff --git a/tests/cpueater/Android.mk b/tests/cpueater/Android.mk
index 0b258b1d..29a524e1 100644
--- a/tests/cpueater/Android.mk
+++ b/tests/cpueater/Android.mk
@@ -27,6 +27,6 @@ LOCAL_MODULE := daemonize
LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
LOCAL_MODULE_TAGS := tests eng
LOCAL_SRC_FILES := daemonize.c
-LOCAL_SHARED_LIBRARIES := libhardware
+LOCAL_SHARED_LIBRARIES := libhardware_legacy
include $(BUILD_EXECUTABLE)
diff --git a/tests/cpueater/daemonize.c b/tests/cpueater/daemonize.c
index 8d07a1c6..3839cdcf 100644
--- a/tests/cpueater/daemonize.c
+++ b/tests/cpueater/daemonize.c
@@ -25,7 +25,7 @@
#include <sys/wait.h>
-#include "hardware/power.h"
+#include "hardware_legacy/power.h"
main(int argc, char **argv)
diff --git a/tests/memtest/Android.mk b/tests/memtest/Android.mk
index d0500b23..36f233c7 100644
--- a/tests/memtest/Android.mk
+++ b/tests/memtest/Android.mk
@@ -8,7 +8,6 @@ LOCAL_SRC_FILES:= memtest.cpp.arm \
LOCAL_SHARED_LIBRARIES := libc
-#libutils libhardware
LOCAL_MODULE:= memtest
diff --git a/timeinfo/Android.mk b/timeinfo/Android.mk
index 16374155..5c4672ea 100644
--- a/timeinfo/Android.mk
+++ b/timeinfo/Android.mk
@@ -20,5 +20,5 @@ LOCAL_MODULE := timeinfo
LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
LOCAL_MODULE_TAGS := tests eng
LOCAL_SRC_FILES := timeinfo.cpp
-LOCAL_SHARED_LIBRARIES := libhardware
+LOCAL_SHARED_LIBRARIES := libhardware_legacy
include $(BUILD_EXECUTABLE)