titaniumsdk: Fix Titanium SDK 3.1 compatibility with the new Android SDK
This commit is contained in:
parent
8523d0e44c
commit
3ce9467f49
@ -49,6 +49,13 @@ stdenv.mkDerivation {
|
||||
''
|
||||
titanium config --config-file $TMPDIR/config.json --no-colors android.sdkPath ${androidsdkComposition}/libexec/android-sdk-*
|
||||
|
||||
# Add zipalign to PATH to make Ti 3.1 builds still work
|
||||
for i in $(find -L ${androidsdkComposition}/libexec/android-sdk-*/build-tools -name zipalign)
|
||||
do
|
||||
export PATH=$(dirname $i):$PATH
|
||||
break
|
||||
done
|
||||
|
||||
${if release then
|
||||
''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target dist-playstore --keystore ${androidKeyStore} --alias ${androidKeyAlias} --password ${androidKeyStorePassword} --output-dir $out''
|
||||
else
|
||||
|
@ -53,8 +53,10 @@ stdenv.mkDerivation {
|
||||
''
|
||||
else ""}
|
||||
|
||||
# Wrap builder script
|
||||
# Fix zipalign compatibility issue with newer Android SDKs
|
||||
sed -i -e 's|zipalign = self.sdk.get_zipalign()|zipalign = "zipalign"|' builder.py
|
||||
|
||||
# Wrap builder script
|
||||
mv builder.py .builder.py
|
||||
cat > builder.py <<EOF
|
||||
#!${python}/bin/python
|
||||
|
Loading…
Reference in New Issue
Block a user