android: fix location of sdk

The file android-sdk_r24.2-linux.tgz contains a directory named android-
sdk-linux and the macos and windows version use similar directory names.

This fixes the following error message:
/iotivity/extlibs/android/gradle/gradle-2.2.1/bin/gradle build -b/iotivity/android/android_api/build.gradle -PTARGET_ARCH=armeabi -PRELEASE=release

FAILURE: Build failed with an exception.

* What went wrong:
A problem occurred configuring project ':base'.
> The SDK directory '/iotivity/extlibs/android/sdk/android-sdk_r24.2' does not exist.

This was only tested under Linux and not tested under windows or macos.

Change-Id: Ia316ed65dc22f653a297b6423d4e1b47a24c8dbe
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1222
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

diff --git a/.gitignore b/.gitignore
index 3cb9926..bd1b459 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -95,6 +95,9 @@ extlibs/cereal
 extlibs/android/gradle/gradle-2.2.1
 extlibs/android/ndk/android-ndk-r10d
 extlibs/android/sdk/android-sdk_r24.2
+extlibs/android/sdk/android-sdk-linux
+extlibs/android/sdk/android-sdk-macosx
+extlibs/android/sdk/android-sdk-windows
 extlibs/boost/boost_1_58_0
 extlibs/tinycbor/tinycbor
 *.tgz

diff --git a/extlibs/android/sdk/SConscript b/extlibs/android/sdk/SConscript
index 17331bd..7b7b1ba 100644 (file)
--- a/extlibs/android/sdk/SConscript
+++ b/extlibs/android/sdk/SConscript
@@ -21,6 +21,7 @@ if target_os == 'android':
        if not android_home:
                print 'Creating ANDROID_HOME for Android SDK'
 
+               # older IoTivity versions expected the SDK at this position, this is left for backwards compatibility
                androidlib_dir      = src_dir + '/extlibs/android/sdk/android-sdk_r24.2'
 
                if not os.path.exists(androidlib_dir):
@@ -28,13 +29,17 @@ if target_os == 'android':
                        if _platform == "linux" or _platform == "linux2":
                                androidlib_zip_file = src_dir + '/extlibs/android/android-sdk_r24.2-linux.tgz'
                                androidlib_url      = 'http://dl.google.com/android/android-sdk_r24.2-linux.tgz'
+                               androidlib_dir      = src_dir + '/extlibs/android/sdk/android-sdk-linux'
                        elif _platform == "darwin":
                                androidlib_zip_file = src_dir + '/extlibs/android/android-sdk_r24.2-macosx.zip'
                                androidlib_url      = 'http://dl.google.com/android/android-sdk_r24.2-macosx.zip'
+                               androidlib_dir      = src_dir + '/extlibs/android/sdk/android-sdk-macosx'
                        elif _platform == "win32":
                                androidlib_zip_file = src_dir + '/extlibs/android/android-sdk_r24.2-windows.zip'
                                androidlib_url      = 'http://dl.google.com/android/android-sdk_r24.2-windows.zip'
+                               androidlib_dir      = src_dir + '/extlibs/android/sdk/android-sdk-windows'
 
+               if not os.path.exists(androidlib_dir):
                        # If the zip file is not already present, download it
                        if not os.path.exists(androidlib_zip_file):
                                androidlib_zip = env.Download(androidlib_zip_file, androidlib_url)