From db64bc6feb3402bffaf5a0ad033280b1f7abc3dd Mon Sep 17 00:00:00 2001 From: ExMix Date: Thu, 14 Nov 2013 17:58:25 +0300 Subject: [PATCH] android compilation fix --- android/3rd_party/external_styles/src/.gitignore | 1 + tools/android/set_up_android.py | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 android/3rd_party/external_styles/src/.gitignore diff --git a/android/3rd_party/external_styles/src/.gitignore b/android/3rd_party/external_styles/src/.gitignore new file mode 100644 index 0000000000..02336ca90e --- /dev/null +++ b/android/3rd_party/external_styles/src/.gitignore @@ -0,0 +1 @@ +# This file is needed to commit empty folder diff --git a/tools/android/set_up_android.py b/tools/android/set_up_android.py index a1a2c7e2d7..d9d3b0be0c 100755 --- a/tools/android/set_up_android.py +++ b/tools/android/set_up_android.py @@ -40,6 +40,8 @@ def replace_aapt(sdkDir, oldAaptName='aapt2'): buildToolsPath = os.path.join(sdkDir, 'build-tools') # Build tools now are in different folders for each version for buildToolsVersion in os.listdir(buildToolsPath): + if not os.path.isdir(os.path.join(buildToolsPath, buildToolsVersion)): + continue aaptPath = os.path.join(buildToolsPath, buildToolsVersion, 'aapt') aaptRealPath = os.path.join(buildToolsPath, buildToolsVersion, oldAaptName)