Merge pull request #7 from CCNX/revert-6-3914-ayyagari-crosscompile-for-android

Revert "3914 ayyagari crosscompile for android"

Author: Glenn Scott

CMakeLists.txt

@@ -17,16 +17,7 @@ include( CTest )
 include( version )
 include( detectCacheSize )
 
-if(DEFINED ENV{ANDROID_API})
-    message("... detected cross compile for $ENV{ANDROID_API_VERSION}")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -D_ANDROID_ -D_$ENV{ANDROID_API_VERSION}_")
-    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} $ENV{LDFLAGS}")
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} $ENV{LDFLAGS}")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} $ENV{LDFLAGS}")
-else()
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
-endif()
-
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
 
 include_directories(${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR}/ccnx/forwarder/metis)
 

ccnx/forwarder/metis/CMakeLists.txt

@@ -258,31 +258,20 @@ set(METIS_TLV_SOURCE
 
 source_group(tlv FILES ${METIS_TLV_SOURCE})
 
-if(DEFINED ENV{ANDROID_API})
-    message("... detected cross compile for $ENV{ANDROID_API_VERSION} ignoring tests")
-    set(METIS_PLATFORM_MODULES 
-      platforms/android/metis_GenericEther.c 
-      platforms/android/metis_System.c
-      platforms/android/ifaddrs.c
-     )
-    source_group(platforms FILES ${METIS_PLATFORM_MODULES})
-else()
-    if ( APPLE )
-      set(METIS_PLATFORM_MODULES 
-        platforms/darwin/metis_GenericEther.c 
-    	platforms/darwin/metis_System.c
-    	)
-      source_group(platforms FILES ${METIS_PLATFORM_MODULES})
-    endif()
-    
-    if( ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" )
-      set(METIS_PLATFORM_MODULES 
-        platforms/linux/metis_GenericEther.c 
-    	platforms/linux/metis_System.c
-    	)
-    endif()
+if ( APPLE )
+  set(METIS_PLATFORM_MODULES 
+    platforms/darwin/metis_GenericEther.c 
+	platforms/darwin/metis_System.c
+	)
+  source_group(platforms FILES ${METIS_PLATFORM_MODULES})
 endif()
 
+if( ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" )
+  set(METIS_PLATFORM_MODULES 
+    platforms/linux/metis_GenericEther.c 
+	platforms/linux/metis_System.c
+	)
+endif()
 
 set(METIS_SOURCE_FILES  
 	metis_About.c 
@@ -308,17 +297,13 @@ foreach(lib ${metis_libraries})
   set_property(TARGET ${lib} PROPERTY C_STANDARD 99)
 endforeach()
 
-if(DEFINED ENV{ANDROID_API})
-    message("... detected cross compile for $ENV{ANDROID_API_VERSION} ignoring tests")
-else()
-    add_subdirectory(test)
-    add_subdirectory(command-line)
-    add_subdirectory(tlv/test)
-    add_subdirectory(strategies/test)
-    add_subdirectory(processor/test)
-    add_subdirectory(messenger/test)
-    add_subdirectory(io/test)
-    add_subdirectory(core/test)
-    add_subdirectory(content_store/test)
-    add_subdirectory(config/test)
-endif()
+add_subdirectory(test)
+add_subdirectory(command-line)
+add_subdirectory(tlv/test)
+add_subdirectory(strategies/test)
+add_subdirectory(processor/test)
+add_subdirectory(messenger/test)
+add_subdirectory(io/test)
+add_subdirectory(core/test)
+add_subdirectory(content_store/test)
+add_subdirectory(config/test)

ccnx/forwarder/metis/config/metis_CommandOps.c

@@ -67,13 +67,11 @@
 #include <LongBow/runtime.h>
 #include <string.h>
 
-#ifndef _ANDROID_
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #else
 extern int errno;
 #endif
-#endif
 
 #include <parc/algol/parc_Memory.h>
 

ccnx/forwarder/metis/config/metis_CommandParser.c

@@ -78,13 +78,11 @@
 
 #include <ccnx/forwarder/metis/config/metis_CommandParser.h>
 
-#ifndef _ANDROID_
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #else
 extern int errno;
 #endif
-#endif
 
 struct metis_command_parser {
     // key = command, value = MetisCommandOps