[android] set up aapt2 correctly

tools/android/set_up_android.py

@@ -5,6 +5,7 @@ import shutil
 import getopt
 import sys
 
+
 def locate_sdk(sdkPath):
     if (not sdkPath):
         sdkPath = raw_input('Enter Android SDK path: ').strip()
@@ -17,8 +18,6 @@ def locate_sdk(sdkPath):
         print 'Incorrect SDK path.'
         exit(1)
 
-### !locate_sdk
-
 
 def locate_ndk(ndkPath):
     if (not ndkPath):
@@ -32,24 +31,20 @@ def locate_ndk(ndkPath):
         print 'Incorrect NDK path.'
         exit(1)
 
-### !locate_ndk
-
 
 def update_assets():
     return os.system('./update_assets.sh')
 
-### !update_assets
 
-
-def replace_aapt(sdkDir, oldAaptName='aapt_backup'):
+def replace_aapt(sdkDir, oldAaptName='aapt2'):
     aaptPath = os.path.join(sdkDir, 'platform-tools', 'aapt')
     aaptOldPath = os.path.join(sdkDir, 'platform-tools', oldAaptName)
 
     # handle case of non-existing file
-    if os.path.exists(aaptPath):
+    if not os.path.exists(aaptOldPath):
         os.rename(aaptPath, aaptOldPath)
     else:
-        print 'aapt not found, skipping'
+        print 'aapt2 already exists, skipping'
 
     # copy new hacked aapt version
     curDir = os.getcwd()
@@ -57,8 +52,6 @@ def replace_aapt(sdkDir, oldAaptName='aapt_backup'):
     print 'hacked path; %s' % hackedAaptPath
     print 'copied: %s' % shutil.copy(hackedAaptPath, aaptPath)
 
-### !replace_aapt
-
 
 def write_local_properties(sdkDir, ndkDir):
     locPropsContent = ('# Autogenerated file\n' +
@@ -85,7 +78,6 @@ def write_local_properties(sdkDir, ndkDir):
         shutil.copy(locPropsOrigin, dst)
         print 'File created:', dst
 
-### !write_local_properties
 
 def usage():
     print "Usage: " + sys.argv[0] + " --sdk <SDK path> --ndk <NDK path>"
@@ -120,13 +112,4 @@ def run():
     write_local_properties(sdkDir, ndkDir)
     print '>>> Done!'
 
-### !run
-
-
-# RUN it!!!
 run()
-
-
-
-
-