androidenv.ndk-bundle: use ${package.path} instead of `ndk/${packag… (#518103)
This commit is contained in:
@@ -76,8 +76,8 @@ deployAndroidPackage rec {
|
||||
|
||||
# Ndk now has a prebuilt toolchains inside, the file layout has changed, we do a symlink
|
||||
# to still support the old standalone toolchains builds.
|
||||
if [ -d $out/libexec/android-sdk/ndk ] && [ ! -d $out/libexec/android-sdk/ndk-bundle ]; then
|
||||
ln -sf $out/libexec/android-sdk/ndk/${package.revision} $out/libexec/android-sdk/ndk-bundle
|
||||
if [ -d $out/libexec/android-sdk/${package.path} ] && [ ! -d $out/libexec/android-sdk/ndk-bundle ]; then
|
||||
ln -sf $out/libexec/android-sdk/${package.path} $out/libexec/android-sdk/ndk-bundle
|
||||
elif [ ! -d $out/libexec/android-sdk/ndk-bundle ]; then
|
||||
echo "The ndk-bundle layout has changed. The nix expressions have to be updated!"
|
||||
exit 1
|
||||
|
||||
Reference in New Issue
Block a user