Fix for X86 target

The X86 target couldn't compile some tests that use assembly, but it can
compile other things that now depend on some projects in the test subdir
(namely libtestUtil for OpenGL tests)

Also fatblock was including <sys/endian.h> directly instead of
<endian.h> which broke some stuff on X86

Change-Id: Ib71a6e548189ca2eacfd0caa7dbd17d200efd0ea

diff --git a/fatblock/fat.c b/fatblock/fat.c
index 02e3292..c549bc1 100644 (file)
--- a/fatblock/fat.c
+++ b/fatblock/fat.c
@@ -16,7 +16,7 @@
 
 #include <assert.h>
 #include <string.h>
-#include <sys/endian.h>
+#include <endian.h>
 
 #include "fat.h"
 

diff --git a/fatblock/fs.c b/fatblock/fs.c
index 5ab33d7..fb19a70 100644 (file)
--- a/fatblock/fs.c
+++ b/fatblock/fs.c
@@ -16,7 +16,7 @@
 
 #include <assert.h>
 #include <string.h>
-#include <sys/endian.h>
+#include <endian.h>
 
 #include "fatblock.h"
 #include "fat.h"

diff --git a/tests/Android.mk b/tests/Android.mk
index 582ddc9..5053e7d 100644 (file)
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -1,3 +1 @@
-ifeq ($(TARGET_ARCH),arm)
 include $(call all-subdir-makefiles)
-endif

diff --git a/tests/icachetest/Android.mk b/tests/icachetest/Android.mk
index 39d0016..f50f790 100644 (file)
--- a/tests/icachetest/Android.mk
+++ b/tests/icachetest/Android.mk
@@ -1,5 +1,5 @@
 # Copyright 2006 The Android Open Source Project
-
+ifeq ($(TARGET_ARCH),arm)
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
@@ -12,3 +12,4 @@ LOCAL_MODULE:= icache
 LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_EXECUTABLE)
+endif

diff --git a/tests/memtest/Android.mk b/tests/memtest/Android.mk
index 7fc6c0a..3b893f6 100644 (file)
--- a/tests/memtest/Android.mk
+++ b/tests/memtest/Android.mk
@@ -1,5 +1,5 @@
 # Copyright 2006 The Android Open Source Project
-
+ifeq ($(TARGET_ARCH),arm)
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
@@ -18,3 +18,4 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_CFLAGS += -fomit-frame-pointer
 
 include $(BUILD_EXECUTABLE)
+endif