OpenSLESUT.h is not (yet) a supported header

so remove the symlink from the SLES/ directory

Change-Id: I95e331ac3b94457fe4c1c063069995bc48a659b4

diff --git a/opensles/include/SLES/OpenSLESUT.h b/opensles/include/SLES/OpenSLESUT.h
deleted file mode 120000 (symlink)
index c34b051..0000000
--- a/opensles/include/SLES/OpenSLESUT.h
+++ /dev/null
@@ -1 +0,0 @@
-../../libopensles/OpenSLESUT.h
\ No newline at end of file

diff --git a/opensles/tests/automated/Android.mk b/opensles/tests/automated/Android.mk
index 1140411..d72e427 100644 (file)
--- a/opensles/tests/automated/Android.mk
+++ b/opensles/tests/automated/Android.mk
@@ -11,7 +11,8 @@ LOCAL_C_INCLUDES:= \
     bionic/libstdc++/include \
     external/gtest/include \
     system/media/opensles/include \
-    external/stlport/stlport
+    external/stlport/stlport \
+    system/media/opensles/libopensles
 
 LOCAL_SRC_FILES:= \
     BufferQueue_test.cpp

diff --git a/opensles/tests/automated/BufferQueue_test.cpp b/opensles/tests/automated/BufferQueue_test.cpp
index aff8547..bd12cb9 100644 (file)
--- a/opensles/tests/automated/BufferQueue_test.cpp
+++ b/opensles/tests/automated/BufferQueue_test.cpp
@@ -31,7 +31,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include "SLES/OpenSLES.h"
-#include "SLES/OpenSLESUT.h"
+#include "OpenSLESUT.h"
 #include <gtest/gtest.h>
 
 typedef struct {

diff --git a/opensles/tests/sandbox/Android.mk b/opensles/tests/sandbox/Android.mk
index 8814bce..25b7652 100644 (file)
--- a/opensles/tests/sandbox/Android.mk
+++ b/opensles/tests/sandbox/Android.mk
@@ -61,7 +61,8 @@ include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := tests
 
 LOCAL_C_INCLUDES:= \
-       system/media/opensles/include
+       system/media/opensles/include \
+       system/media/opensles/libopensles
 
 LOCAL_SRC_FILES:= \
        engine.c
@@ -90,7 +91,8 @@ include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := tests
 
 LOCAL_C_INCLUDES:= \
-       system/media/opensles/include
+       system/media/opensles/include \
+    system/media/opensles/libopensles
 
 LOCAL_SRC_FILES:= \
        object.c
@@ -203,7 +205,8 @@ include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := tests
 
 LOCAL_C_INCLUDES:= \
-       system/media/opensles/include
+       system/media/opensles/include \
+       system/media/opensles/libopensles
 
 LOCAL_SRC_FILES:= \
        outputmix.c

diff --git a/opensles/tests/sandbox/engine.c b/opensles/tests/sandbox/engine.c
index 16d60fe..edc25b8 100644 (file)
--- a/opensles/tests/sandbox/engine.c
+++ b/opensles/tests/sandbox/engine.c
@@ -15,7 +15,7 @@
  */
 
 #include "SLES/OpenSLES.h"
-#include "SLES/OpenSLESUT.h"
+#include "OpenSLESUT.h"
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/opensles/tests/sandbox/object.c b/opensles/tests/sandbox/object.c
index aff2cc2..13e36d2 100644 (file)
--- a/opensles/tests/sandbox/object.c
+++ b/opensles/tests/sandbox/object.c
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "SLES/OpenSLES.h"
-#include "SLES/OpenSLESUT.h"
+#include "OpenSLESUT.h"
 
 int main(int arg, char **argv)
 {

diff --git a/opensles/tests/sandbox/outputmix.c b/opensles/tests/sandbox/outputmix.c
index f0d15f6..d8f836b 100644 (file)
--- a/opensles/tests/sandbox/outputmix.c
+++ b/opensles/tests/sandbox/outputmix.c
@@ -17,7 +17,7 @@
 // output mix interface tests
 
 #include "SLES/OpenSLES.h"
-#include "SLES/OpenSLESUT.h"
+#include "OpenSLESUT.h"
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>