diff options
| -rw-r--r-- | cmds/system_server/library/Android.mk | 3 | ||||
| -rw-r--r-- | core/jni/Android.mk | 4 | ||||
| -rw-r--r-- | libs/androidfw/tests/InputChannel_test.cpp | 2 | ||||
| -rw-r--r-- | libs/androidfw/tests/InputPublisherAndConsumer_test.cpp | 2 | ||||
| -rw-r--r-- | libs/androidfw/tests/TestHelpers.h | 79 | ||||
| -rw-r--r-- | opengl/tests/EGLTest/Android.mk | 4 |
6 files changed, 86 insertions, 8 deletions
diff --git a/cmds/system_server/library/Android.mk b/cmds/system_server/library/Android.mk index e8afce3..7d08a8c 100644 --- a/cmds/system_server/library/Android.mk +++ b/cmds/system_server/library/Android.mk @@ -5,13 +5,14 @@ LOCAL_SRC_FILES:= \ system_init.cpp base = $(LOCAL_PATH)/../../.. +native = $(LOCAL_PATH)/../../../../native LOCAL_C_INCLUDES := \ $(base)/services/camera/libcameraservice \ $(base)/services/audioflinger \ - $(base)/services/surfaceflinger \ $(base)/services/sensorservice \ $(base)/media/libmediaplayerservice \ + $(native)/services/surfaceflinger \ $(JNI_H_INCLUDE) LOCAL_SHARED_LIBRARIES := \ diff --git a/core/jni/Android.mk b/core/jni/Android.mk index c6d3cee..c389cf7 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -159,12 +159,10 @@ LOCAL_C_INCLUDES += \ $(JNI_H_INCLUDE) \ $(LOCAL_PATH)/android/graphics \ $(LOCAL_PATH)/../../libs/hwui \ - $(LOCAL_PATH)/../../opengl/libs \ + $(LOCAL_PATH)/../../../native/opengl/libs \ $(call include-path-for, bluedroid) \ $(call include-path-for, libhardware)/hardware \ $(call include-path-for, libhardware_legacy)/hardware_legacy \ - $(LOCAL_PATH)/../../include/ui \ - $(LOCAL_PATH)/../../include/utils \ external/skia/include/core \ external/skia/include/effects \ external/skia/include/images \ diff --git a/libs/androidfw/tests/InputChannel_test.cpp b/libs/androidfw/tests/InputChannel_test.cpp index 0e5d19d..7fff8af 100644 --- a/libs/androidfw/tests/InputChannel_test.cpp +++ b/libs/androidfw/tests/InputChannel_test.cpp @@ -23,7 +23,7 @@ #include <time.h> #include <errno.h> -#include "../../utils/tests/TestHelpers.h" +#include "TestHelpers.h" namespace android { diff --git a/libs/androidfw/tests/InputPublisherAndConsumer_test.cpp b/libs/androidfw/tests/InputPublisherAndConsumer_test.cpp index bb45247..442b62f 100644 --- a/libs/androidfw/tests/InputPublisherAndConsumer_test.cpp +++ b/libs/androidfw/tests/InputPublisherAndConsumer_test.cpp @@ -23,7 +23,7 @@ #include <sys/mman.h> #include <cutils/ashmem.h> -#include "../../utils/tests/TestHelpers.h" +#include "TestHelpers.h" namespace android { diff --git a/libs/androidfw/tests/TestHelpers.h b/libs/androidfw/tests/TestHelpers.h new file mode 100644 index 0000000..d8e985e --- /dev/null +++ b/libs/androidfw/tests/TestHelpers.h @@ -0,0 +1,79 @@ +/* + * Copyright (C) 2010 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef TESTHELPERS_H +#define TESTHELPERS_H + +#include <utils/threads.h> + +namespace android { + +class Pipe { +public: + int sendFd; + int receiveFd; + + Pipe() { + int fds[2]; + ::pipe(fds); + + receiveFd = fds[0]; + sendFd = fds[1]; + } + + ~Pipe() { + if (sendFd != -1) { + ::close(sendFd); + } + + if (receiveFd != -1) { + ::close(receiveFd); + } + } + + status_t writeSignal() { + ssize_t nWritten = ::write(sendFd, "*", 1); + return nWritten == 1 ? 0 : -errno; + } + + status_t readSignal() { + char buf[1]; + ssize_t nRead = ::read(receiveFd, buf, 1); + return nRead == 1 ? 0 : nRead == 0 ? -EPIPE : -errno; + } +}; + +class DelayedTask : public Thread { + int mDelayMillis; + +public: + DelayedTask(int delayMillis) : mDelayMillis(delayMillis) { } + +protected: + virtual ~DelayedTask() { } + + virtual void doTask() = 0; + + virtual bool threadLoop() { + usleep(mDelayMillis * 1000); + doTask(); + return false; + } +}; + +} // namespace android + +#endif // TESTHELPERS_H diff --git a/opengl/tests/EGLTest/Android.mk b/opengl/tests/EGLTest/Android.mk index 14104d1..d8e7012 100644 --- a/opengl/tests/EGLTest/Android.mk +++ b/opengl/tests/EGLTest/Android.mk @@ -26,8 +26,8 @@ LOCAL_C_INCLUDES := \ bionic/libstdc++/include \ external/gtest/include \ external/stlport/stlport \ - frameworks/base/opengl/libs \ - frameworks/base/opengl/libs/EGL \ + frameworks/native/opengl/libs \ + frameworks/native/opengl/libs/EGL \ include $(BUILD_EXECUTABLE) |