Merge pull request #12447 from gpyh/fix-android-build-tools
Renamed subdirectories in Android SKD's build-tools
This commit is contained in:
commit
5db2412159
@ -219,7 +219,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
|
||||
|
Loading…
Reference in New Issue
Block a user