summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--osi/Android.mk6
-rw-r--r--osi/test/AllocationTestHarness.cpp4
2 files changed, 6 insertions, 4 deletions
diff --git a/osi/Android.mk b/osi/Android.mk
index 3d0316fc5..7141dff47 100644
--- a/osi/Android.mk
+++ b/osi/Android.mk
@@ -21,7 +21,8 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/include
+ $(LOCAL_PATH)/include \
+ $(LOCAL_PATH)/..
LOCAL_SRC_FILES := \
./src/alarm.c \
@@ -54,7 +55,8 @@ include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/include
+ $(LOCAL_PATH)/include \
+ $(LOCAL_PATH)/..
LOCAL_SRC_FILES := \
./test/AlarmTestHarness.cpp \
diff --git a/osi/test/AllocationTestHarness.cpp b/osi/test/AllocationTestHarness.cpp
index 2bd5c5c21..0132c738d 100644
--- a/osi/test/AllocationTestHarness.cpp
+++ b/osi/test/AllocationTestHarness.cpp
@@ -18,10 +18,10 @@
#include <gtest/gtest.h>
-#include "AllocationTestHarness.h"
+#include "osi/test/AllocationTestHarness.h"
extern "C" {
-#include "allocation_tracker.h"
+#include "osi/include/allocation_tracker.h"
}
void AllocationTestHarness::SetUp() {