Define ANDROID_HOME on buildserver

diff --git a/buildserver/cookbooks/android-sdk/recipes/default.rb b/buildserver/cookbooks/android-sdk/recipes/default.rb
index db5acf2b5a724fa357a77ccbd079b01d6c41e1e2..9e4c8b68a5741ab4a399f8dc3d7820e482df1473 100644 (file)
--- a/buildserver/cookbooks/android-sdk/recipes/default.rb
+++ b/buildserver/cookbooks/android-sdk/recipes/default.rb
@@ -19,8 +19,14 @@ end
 execute "add-android-sdk-path" do
   user user
   path = "#{sdk_loc}/tools:#{sdk_loc}/platform-tools"
-  command "echo \"export PATH=\\$PATH:#{path}\" >> /home/#{user}/.bashrc"
-  not_if "grep #{sdk_loc} /home/#{user}/.bashrc"
+  command "echo \"export PATH=\\$PATH:#{path} #PATH-SDK\" >> /home/#{user}/.bashrc"
+  not_if "grep PATH-SDK /home/#{user}/.bashrc"
+end
+
+execute "add-android-home" do
+  user user
+  command "echo \"export ANDROID_HOME=#{sdk_loc}\" >> /home/#{user}/.bashrc"
+  not_if "grep ANDROID_HOME /home/#{user}/.bashrc"
 end
 
 %w{17.0.0 18.0.1}.each do |ver|