From e2990dddf45d9128704bba2e015953b390ff442d Mon Sep 17 00:00:00 2001 From: edunham Date: Mon, 21 Mar 2016 12:35:23 -0700 Subject: [PATCH] NDK installation should run whenever it's not installed According to https://docs.saltstack.com/en/latest/ref/states/all/salt.states.cmd.html#should-i-use-cmd-run-or-cmd-wait, ndk installation will only try to run if the ndk was just downloaded. In the old implementation, if you succeed at downloading the ndk but fail to install it, subsequent highstates won't attempt to install the ndk because the downloaded file will be unchanged. --- android-dependencies.sls | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/android-dependencies.sls b/android-dependencies.sls index 127fa32e..8b705c50 100644 --- a/android-dependencies.sls +++ b/android-dependencies.sls @@ -72,13 +72,12 @@ android-ndk: - file: android-ndk android-ndk-toolset-configuration: - cmd.wait: + cmd.run: - name: bash /home/servo/android-ndk-r10e/build/tools/make-standalone-toolchain.sh --platform=android-18 --toolchain=arm-linux-androideabi-4.8 --install-dir='/home/servo/ndk-toolchain' --ndk-dir='/home/servo/android-ndk-r10e' - user: servo - require: - cmd: android-sdk - - watch: - - cmd: android-ndk + - creates: /home/servo/ndk-toolchain /home/servo/.bash_profile: file.managed: