Merge branch 'staging' into closure-size

2016-01-19 09:55:31 +01:00
parent f8472457a4 53b389327e
commit 716aac2519
1293 changed files with 75245 additions and 28520 deletions
@@ -221,7 +221,7 @@ stdenv.mkDerivation rec {
        fi
    done

-    for i in $out/libexec/android-sdk-*/build-tools/android-*/*
+    for i in $out/libexec/android-sdk-*/build-tools/*/*
    do
        if [ ! -d $i ] && [ -x $i ]
        then
@@ -18,10 +18,11 @@ stdenv.mkDerivation rec {
    mkdir -p $out/build-tools
    cd $out/build-tools
    unzip $src
+    mv android-* ${version}
    
    ${stdenv.lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
      ''
-        cd android-*
+        cd ${version}
        
        # Patch the interpreter
        for i in aapt aidl bcc_compat dexdump llvm-rs-cc