Fixed openal lib copying issue using a script and removed the todos from the testing since they are not compiled anyway

engine/compilers/android/jni/Android.mk

@@ -30,6 +30,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE    := libopenal
 LOCAL_SRC_FILES := ../../../lib/openal/Android/$(TARGET_ARCH_ABI)/libopenal.so
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../lib/openal/Android
+$(info $(shell ($(LOCAL_PATH)/copylib.sh $(LOCAL_PATH) $(TARGET_ARCH_ABI))))
 
 include $(PREBUILT_SHARED_LIBRARY)
 

engine/compilers/android/jni/copylib.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+echo copying openal lib to $2
+cp $1/../../../lib/openal/Android/$2/libopenal.so $1/../obj/local/$2/libopenal.so

engine/source/testing/tests/platformFileIoTests.cc

@@ -41,8 +41,6 @@
 #define PLATFORM_UNITTEST_FILEIO_FILEMESSAGE    "Write a line of text."
 
 //-----------------------------------------------------------------------------
-//TODO: android
-#ifndef TORQUE_OS_ANDROID
 TEST( PlatformFileIOTests, FileWriteRead )
 {
     File testWriteFile;
@@ -122,7 +120,6 @@ TEST( PlatformFileIOTests, FileWriteRead )
     // Check the file has been deleted.
     ASSERT_TRUE( Platform::fileDelete( PLATFORM_UNITTEST_FILEIO_FILE ) );
 }
-#endif
 //-----------------------------------------------------------------------------
 
 #endif // TORQUE_SHIPPING

engine/source/testing/tests/platformMemoryTests.cc

@@ -36,8 +36,6 @@
 #define PLATFORM_UNITTEST_MEMORY_BUFFERSIZE     16384
 
 //-----------------------------------------------------------------------------
-//TODO: android
-#ifndef TORQUE_OS_ANDROID
 TEST( PlatformMemoryTests, dMallocrAnddFreeTest )
 {
     // Allocate some memory.
@@ -166,6 +164,5 @@ TEST( PlatformMemoryTests, dMemcmpTest )
     ASSERT_EQ( 0, result2 ) << "Memory compare is incorrect.";
     ASSERT_GT( 0, result3 ) << "Memory compare is incorrect.";
 }
-#endif
 
 #endif // TORQUE_SHIPPING

engine/source/testing/tests/platformStringTests.cc

@@ -36,8 +36,6 @@
 #define PLATFORM_UNITTEST_STRING_DESTINATION_BUFFERSIZE     1024
 
 //-----------------------------------------------------------------------------
-//TODO: android
-#ifndef TORQUE_OS_ANDROID
 TEST( PlatformStringTests, dStrlenTest )
 {
     // Check length of string.
@@ -611,5 +609,4 @@ TEST( PlatformStringTests, dIsspaceTest )
         ASSERT_EQ( false, dIsspace(source3[index]) );
     }
 }
-#endif
 #endif // TORQUE_SHIPPING

engine/source/testing/unitTesting.cc

@@ -30,8 +30,7 @@
 #ifndef _UNIT_TESTING_H_
 #include "testing/unitTesting.h"
 #endif
-//TODO: android
-#ifndef TORQUE_OS_ANDROID
+
 #include "src/gtest.cc"
 #include "src/gtest-death-test.cc"
 #include "src/gtest-filepath.cc"
@@ -39,7 +38,6 @@
 #include "src/gtest-printers.cc"
 #include "src/gtest-test-part.cc"
 #include "src/gtest-typed-test.cc"
-#endif
 //-----------------------------------------------------------------------------
 
 class TorqueUnitTestListener : public ::testing::EmptyTestEventListener

engine/source/testing/unitTesting.h

@@ -29,8 +29,7 @@
 #define _VARIADIC_MAX 10
 #endif
 
-//TODO: android
-//#include "gtest/gtest.h"
+#include "gtest/gtest.h"
 
 #endif // TORQUE_SHIPPING