diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-05-21 10:53:33 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-05-21 10:53:33 +0200 |
| commit | d307e836576cf518703470ab81876edb5b14e085 (patch) | |
| tree | 48c363aa89f7aa36a6731430a00061c027e5553c /scripts/Util.py | |
| parent | Replaced virtual public by public virtual (diff) | |
| download | ice-d307e836576cf518703470ab81876edb5b14e085.tar.bz2 ice-d307e836576cf518703470ab81876edb5b14e085.tar.xz ice-d307e836576cf518703470ab81876edb5b14e085.zip | |
Added check for Android SDK installation
Diffstat (limited to 'scripts/Util.py')
| -rw-r--r-- | scripts/Util.py | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index 6a71bf59745..bb9467bd1da 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -3175,6 +3175,16 @@ from IceStormUtil import * from LocalDriver import * # +# Check if the Android SDK is installed by looking for adb +# +hasAndroidSDK=False +try: + run("adb version") + hasAndroidSDK=True +except: + pass + +# # Supported mappings # for m in filter(lambda x: os.path.isdir(os.path.join(toplevel, x)), os.listdir(toplevel)): @@ -3196,9 +3206,9 @@ for m in filter(lambda x: os.path.isdir(os.path.join(toplevel, x)), os.listdir( Mapping.add(m, CSharpMapping()) elif m == "objective-c" or re.match("objective-c-*", m): Mapping.add(m, ObjCMapping()) - elif m == "android-compat": + elif hasAndroidSDK and m == "android-compat": Mapping.add(m, AndroidCompatMapping()) - elif m == "android": + elif hasAndroidSDK and m == "android": Mapping.add(m, AndroidMapping()) def runTestsWithPath(path): |