assets/rakelib/ruboto.rake in ruboto-0.16.0 vs assets/rakelib/ruboto.rake in ruboto-1.0.0

@@ -32,18 +32,18 @@
 adb_version_str = `adb version`
 (puts 'Android SDK platform tools not in PATH (adb command not found).'; exit 1) unless $? == 0
 (puts "Unrecognized adb version: #$1"; exit 1) unless adb_version_str =~ /Android Debug Bridge version (\d+\.\d+\.\d+)/
 (puts "adb version 1.0.31 or later required.  Version found: #$1"; exit 1) unless Gem::Version.new($1) >= Gem::Version.new('1.0.31')
 android_home = ENV['ANDROID_HOME']
-android_home = android_home.gsub("\\", '/') unless android_home.nil?
 if android_home.nil?
   if (adb_path = which('adb'))
     android_home = File.dirname(File.dirname(adb_path))
+    ENV['ANDROID_HOME'] = android_home
   else
     abort 'You need to set the ANDROID_HOME environment variable.'
   end
 else
-  android_home.gsub! '\\', '/'
+  android_home = android_home.gsub('\\', '/')
 end
 
 # FIXME(uwe): Simplify when we stop supporting Android SDK < 22: Don't look in platform-tools for dx
 DX_FILENAME = Dir[File.join(android_home, '{build-tools/*,platform-tools}', ON_WINDOWS ? 'dx.bat' : 'dx')][-1]
 # EMXIF