Fix Android build failures, enable random unit tests
authorErich Keane <erich.keane@intel.com>
Mon, 18 May 2015 17:51:06 +0000 (10:51 -0700)
committerErich Keane <erich.keane@intel.com>
Tue, 19 May 2015 00:24:17 +0000 (00:24 +0000)
commitd93227e676bc45605da89a76bca33d38d13c8eeb
treeab74134a3db09bf55df15ed6001df9fb6e78fbdf
parent7333523f607188718755d2ff4b4a36c2e497ebec
Fix Android build failures, enable random  unit tests

It was discovered that the ocrandom uuid changes broke the android
build.  This is because Android, despite being an incomplete linux
implementation, defines __linux__.  This patch fixes that, and properly
enables the ocrandom unit tests.

Additionally, the OC_WIFI/OC_ETHERNET removals weren't propogated
properly to the android build, this patch does that in order to fix the
build.

Change-Id: Iabfeb704d046fbadf1fd368259d0e96ca1e74d90
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1020
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-by: Vijay Kesavan <vijay.s.kesavan@intel.com>
android/android_api/base/jni/JniUtils.h
android/android_api/base/src/androidTest/java/org/iotivity/base/SmokeTest.java
android/android_api/base/src/main/java/org/iotivity/base/OcConnectivityType.java
android/android_api/base/src/main/java/org/iotivity/base/OcPlatform.java
resource/csdk/ocrandom/src/ocrandom.c
resource/csdk/ocrandom/test/SConscript [new file with mode: 0644]