зеркало из https://github.com/mozilla/gecko-dev.git
Bug 859984 - use tooltool ndk / sdk when on a x86_64 host. r=glandium,r=coop
This commit is contained in:
Trevor Saunders
Родитель
809ba24a73
Коммит
8610dcd958
|
|
@ -9,8 +9,15 @@ ac_add_options --enable-application=mobile/android
|
|||
# Android
|
||||
ac_add_options --target=arm-linux-androideabi
|
||||
ac_add_options --with-arch=armv6
|
||||
ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
|
||||
ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
|
||||
|
||||
if test `uname -m` = 'x86_64'; then
|
||||
ac_add_options --with-android-ndk="$topsrcdir/android-ndk-r8e-arm-gcc4.6"
|
||||
ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
|
||||
else
|
||||
ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
|
||||
ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
|
||||
fi
|
||||
|
||||
ac_add_options --with-android-gnu-compiler-version=4.6
|
||||
ac_add_options --with-android-version=9
|
||||
ac_add_options --with-system-zlib
|
||||
|
|
|
|||
|
|
@ -15,8 +15,15 @@ ac_add_options --enable-application=mobile/android
|
|||
# Android
|
||||
ac_add_options --target=arm-linux-androideabi
|
||||
ac_add_options --with-arch=armv6
|
||||
ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
|
||||
ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
|
||||
|
||||
if test `uname -m` = 'x86_64'; then
|
||||
ac_add_options --with-android-ndk="$topsrcdir/android-ndk-r8e-arm-gcc4.6"
|
||||
ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
|
||||
else
|
||||
ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
|
||||
ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
|
||||
fi
|
||||
|
||||
ac_add_options --with-android-gnu-compiler-version=4.6
|
||||
ac_add_options --with-android-version=9
|
||||
ac_add_options --with-system-zlib
|
||||
|
|
|
|||
|
|
@ -12,8 +12,15 @@ ac_add_options --enable-application=mobile/android
|
|||
# Android
|
||||
ac_add_options --target=arm-linux-androideabi
|
||||
ac_add_options --with-arch=armv6
|
||||
ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
|
||||
ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
|
||||
|
||||
if test `uname -m` = 'x86_64'; then
|
||||
ac_add_options --with-android-ndk="$topsrcdir/android-ndk-r8e-arm-gcc4.6"
|
||||
ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
|
||||
else
|
||||
ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
|
||||
ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
|
||||
fi
|
||||
|
||||
ac_add_options --with-android-gnu-compiler-version=4.6
|
||||
ac_add_options --with-android-version=9
|
||||
ac_add_options --with-system-zlib
|
||||
|
|
|
|||
|
|
@ -6,8 +6,15 @@ ac_add_options --enable-application=mobile/android
|
|||
# Android
|
||||
ac_add_options --target=arm-linux-androideabi
|
||||
ac_add_options --with-arch=armv6
|
||||
ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
|
||||
ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
|
||||
|
||||
if test `uname -m` = 'x86_64'; then
|
||||
ac_add_options --with-android-ndk="$topsrcdir/android-ndk-r8e-arm-gcc4.6"
|
||||
ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
|
||||
else
|
||||
ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
|
||||
ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
|
||||
fi
|
||||
|
||||
ac_add_options --with-android-gnu-compiler-version=4.6
|
||||
ac_add_options --with-android-version=9
|
||||
ac_add_options --with-system-zlib
|
||||
|
|
|
|||
|
|
@ -6,8 +6,15 @@ ac_add_options --enable-application=mobile/android
|
|||
# Android
|
||||
ac_add_options --target=arm-linux-androideabi
|
||||
ac_add_options --with-arch=armv6
|
||||
ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
|
||||
ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
|
||||
|
||||
if test `uname -m` = 'x86_64'; then
|
||||
ac_add_options --with-android-ndk="$topsrcdir/android-ndk-r8e-arm-gcc4.6"
|
||||
ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
|
||||
else
|
||||
ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
|
||||
ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
|
||||
fi
|
||||
|
||||
ac_add_options --with-android-gnu-compiler-version=4.6
|
||||
ac_add_options --with-android-version=9
|
||||
ac_add_options --with-system-zlib
|
||||
|
|
|
|||
|
|
@ -5,8 +5,15 @@ ac_add_options --enable-application=mobile/android
|
|||
|
||||
# Android
|
||||
ac_add_options --target=arm-linux-androideabi
|
||||
ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
|
||||
ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
|
||||
|
||||
if test `uname -m` = 'x86_64'; then
|
||||
ac_add_options --with-android-ndk="$topsrcdir/android-ndk-r8e-arm-gcc4.6"
|
||||
ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
|
||||
else
|
||||
ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
|
||||
ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
|
||||
fi
|
||||
|
||||
ac_add_options --with-android-gnu-compiler-version=4.6
|
||||
ac_add_options --with-android-version=9
|
||||
ac_add_options --with-system-zlib
|
||||
|
|
|
|||
|
|
@ -8,8 +8,15 @@ ac_add_options --enable-application=mobile/android
|
|||
|
||||
# Android
|
||||
ac_add_options --target=i386-linux-android
|
||||
ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
|
||||
ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
|
||||
|
||||
if test `uname -m` = 'x86_64'; then
|
||||
ac_add_options --with-android-ndk="$topsrcdir/android-ndk-r8e-x86-gcc4.6"
|
||||
ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
|
||||
else
|
||||
ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
|
||||
ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
|
||||
fi
|
||||
|
||||
ac_add_options --with-android-gnu-compiler-version=4.6
|
||||
ac_add_options --with-android-version=9
|
||||
ac_add_options --with-system-zlib
|
||||
|
|
|
|||
|
|
@ -14,8 +14,15 @@ ac_add_options --enable-application=mobile/android
|
|||
|
||||
# Android
|
||||
ac_add_options --target=i386-linux-android
|
||||
ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
|
||||
ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
|
||||
|
||||
if test `uname -m` = 'x86_64'; then
|
||||
ac_add_options --with-android-ndk="$topsrcdir/android-ndk-r8e-x86-gcc4.6"
|
||||
ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
|
||||
else
|
||||
ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
|
||||
ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
|
||||
fi
|
||||
|
||||
ac_add_options --with-android-gnu-compiler-version=4.6
|
||||
ac_add_options --with-android-version=9
|
||||
ac_add_options --with-system-zlib
|
||||
|
|
|
|||
|
|
@ -11,8 +11,15 @@ ac_add_options --enable-application=mobile/android
|
|||
|
||||
# Android
|
||||
ac_add_options --target=i386-linux-android
|
||||
ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
|
||||
ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
|
||||
|
||||
if test `uname -m` = 'x86_64'; then
|
||||
ac_add_options --with-android-ndk="$topsrcdir/android-ndk-r8e-x86-gcc4.6"
|
||||
ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
|
||||
else
|
||||
ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
|
||||
ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
|
||||
fi
|
||||
|
||||
ac_add_options --with-android-gnu-compiler-version=4.6
|
||||
ac_add_options --with-android-version=9
|
||||
ac_add_options --with-system-zlib
|
||||
|
|
|
|||
|
|
@ -5,8 +5,15 @@ ac_add_options --enable-application=mobile/android
|
|||
|
||||
# Android
|
||||
ac_add_options --target=i386-linux-android
|
||||
ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
|
||||
ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
|
||||
|
||||
if test `uname -m` = 'x86_64'; then
|
||||
ac_add_options --with-android-ndk="$topsrcdir/android-ndk-r8e-x86-gcc4.6"
|
||||
ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
|
||||
else
|
||||
ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
|
||||
ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
|
||||
fi
|
||||
|
||||
ac_add_options --with-android-gnu-compiler-version=4.6
|
||||
ac_add_options --with-android-version=9
|
||||
ac_add_options --with-system-zlib
|
||||
|
|
|
|||
|
|
@ -5,8 +5,15 @@ ac_add_options --enable-application=mobile/android
|
|||
|
||||
# Android
|
||||
ac_add_options --target=i386-linux-android
|
||||
ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
|
||||
ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
|
||||
|
||||
if test `uname -m` = 'x86_64'; then
|
||||
ac_add_options --with-android-ndk="$topsrcdir/android-ndk-r8e-x86-gcc4.6"
|
||||
ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
|
||||
else
|
||||
ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
|
||||
ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
|
||||
fi
|
||||
|
||||
ac_add_options --with-android-gnu-compiler-version=4.6
|
||||
ac_add_options --with-android-version=9
|
||||
ac_add_options --with-system-zlib
|
||||
|
|
|
|||
|
|
@ -8,8 +8,15 @@ ac_add_options --enable-application=mobile/android
|
|||
|
||||
# Android
|
||||
ac_add_options --target=arm-linux-androideabi
|
||||
ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
|
||||
ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
|
||||
|
||||
if test `uname -m` = 'x86_64'; then
|
||||
ac_add_options --with-android-ndk="$topsrcdir/android-ndk-r8e-arm-gcc4.6"
|
||||
ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
|
||||
else
|
||||
ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
|
||||
ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
|
||||
fi
|
||||
|
||||
ac_add_options --with-android-gnu-compiler-version=4.6
|
||||
ac_add_options --with-android-version=9
|
||||
ac_add_options --with-system-zlib
|
||||
|
|
|
|||
|
|
@ -14,8 +14,15 @@ ac_add_options --enable-application=mobile/android
|
|||
|
||||
# Android
|
||||
ac_add_options --target=arm-linux-androideabi
|
||||
ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
|
||||
ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
|
||||
|
||||
if test `uname -m` = 'x86_64'; then
|
||||
ac_add_options --with-android-ndk="$topsrcdir/android-ndk-r8e-arm-gcc4.6"
|
||||
ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
|
||||
else
|
||||
ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
|
||||
ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
|
||||
fi
|
||||
|
||||
ac_add_options --with-android-gnu-compiler-version=4.6
|
||||
ac_add_options --with-android-version=9
|
||||
ac_add_options --with-system-zlib
|
||||
|
|
|
|||
|
|
@ -11,8 +11,15 @@ ac_add_options --enable-application=mobile/android
|
|||
|
||||
# Android
|
||||
ac_add_options --target=arm-linux-androideabi
|
||||
ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
|
||||
ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
|
||||
|
||||
if test `uname -m` = 'x86_64'; then
|
||||
ac_add_options --with-android-ndk="$topsrcdir/android-ndk-r8e-arm-gcc4.6"
|
||||
ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
|
||||
else
|
||||
ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
|
||||
ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
|
||||
fi
|
||||
|
||||
ac_add_options --with-android-gnu-compiler-version=4.6
|
||||
ac_add_options --with-android-version=9
|
||||
ac_add_options --with-system-zlib
|
||||
|
|
|
|||
|
|
@ -5,8 +5,15 @@ ac_add_options --enable-application=mobile/android
|
|||
|
||||
# Android
|
||||
ac_add_options --target=arm-linux-androideabi
|
||||
ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
|
||||
ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
|
||||
|
||||
if test `uname -m` = 'x86_64'; then
|
||||
ac_add_options --with-android-ndk="$topsrcdir/android-ndk-r8e-arm-gcc4.6"
|
||||
ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
|
||||
else
|
||||
ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
|
||||
ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
|
||||
fi
|
||||
|
||||
ac_add_options --with-android-gnu-compiler-version=4.6
|
||||
ac_add_options --with-android-version=9
|
||||
ac_add_options --with-system-zlib
|
||||
|
|
|
|||
|
|
@ -5,8 +5,15 @@ ac_add_options --enable-application=mobile/android
|
|||
|
||||
# Android
|
||||
ac_add_options --target=arm-linux-androideabi
|
||||
ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
|
||||
ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
|
||||
|
||||
if test `uname -m` = 'x86_64'; then
|
||||
ac_add_options --with-android-ndk="$topsrcdir/android-ndk-r8e-arm-gcc4.6"
|
||||
ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
|
||||
else
|
||||
ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
|
||||
ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
|
||||
fi
|
||||
|
||||
ac_add_options --with-android-gnu-compiler-version=4.6
|
||||
ac_add_options --with-android-version=9
|
||||
ac_add_options --with-system-zlib
|
||||
|
|
|
|||
|
|
@ -0,0 +1,20 @@
|
|||
[
|
||||
{
|
||||
"size": 75650889,
|
||||
"digest": "225ee9bb331a08ec496acc47ef8a1e9d9a21c290bfe22271cdc6ee2d10befecc372faf2a718e3e0ad5c36938a9b94f5d6b6b2d999880bc476c576856f1c99812",
|
||||
"algorithm": "sha512",
|
||||
"filename": "android-ndk-r8e-arm-gcc4.6.tar.bz2"
|
||||
},
|
||||
{
|
||||
"size": 147088338,
|
||||
"digest": "56fc5dc8c5e8cf46605667db153477e32bdf724bfa989663bbbed7e52ee47a4cb8cf7f8bf49b82b7e15fc89efe59a0f1656ca4b7a4ffcc8de31f9b2229549dab",
|
||||
"algorithm": "sha512",
|
||||
"filename": "android-sdk-16.tar.bz2"
|
||||
},
|
||||
{
|
||||
"size": 269,
|
||||
"digest": "0c21a793d87773b3ed82d141bea33869a6b647e5dddab3ecfee1738751e5c8d3d0b9ca45d7453ef88d335949c73f935c37de3521978b318ca51d8369be894b92",
|
||||
"algorithm": "sha512",
|
||||
"filename": "setup.sh"
|
||||
}
|
||||
]
|
||||
|
|
@ -1 +0,0 @@
|
|||
[]
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
[
|
||||
{
|
||||
"size": 78190771,
|
||||
"digest": "57c69c5f55722f197ca6a5bd7d366d3562df474da8d98a6df753830c8234c269c1a174e518168b801e39290db081ef192a8fa24fcc5133039b1ad489dfe45f48",
|
||||
"algorithm": "sha512",
|
||||
"filename": "android-ndk-r8e-x86-gcc4.6.tar.bz2"
|
||||
},
|
||||
{
|
||||
"size": 147088338,
|
||||
"digest": "56fc5dc8c5e8cf46605667db153477e32bdf724bfa989663bbbed7e52ee47a4cb8cf7f8bf49b82b7e15fc89efe59a0f1656ca4b7a4ffcc8de31f9b2229549dab",
|
||||
"algorithm": "sha512",
|
||||
"filename": "android-sdk-16.tar.bz2"
|
||||
},
|
||||
{
|
||||
"size": 273,
|
||||
"digest": "3db7c58c2002e96e6c0c34468f3349ca7de17c7473e07edec054ee3083ae39e6ead0e2a8f9177c1ce5891539073280e1afda1a6518f78e999dddc5d3f02a1e18",
|
||||
"algorithm": "sha512",
|
||||
"filename": "setup.sh"
|
||||
}
|
||||
]
|
||||
|
|
@ -1 +1,20 @@
|
|||
[]
|
||||
[
|
||||
{
|
||||
"size": 75650889,
|
||||
"digest": "225ee9bb331a08ec496acc47ef8a1e9d9a21c290bfe22271cdc6ee2d10befecc372faf2a718e3e0ad5c36938a9b94f5d6b6b2d999880bc476c576856f1c99812",
|
||||
"algorithm": "sha512",
|
||||
"filename": "android-ndk-r8e-arm-gcc4.6.tar.bz2"
|
||||
},
|
||||
{
|
||||
"size": 147088338,
|
||||
"digest": "56fc5dc8c5e8cf46605667db153477e32bdf724bfa989663bbbed7e52ee47a4cb8cf7f8bf49b82b7e15fc89efe59a0f1656ca4b7a4ffcc8de31f9b2229549dab",
|
||||
"algorithm": "sha512",
|
||||
"filename": "android-sdk-16.tar.bz2"
|
||||
},
|
||||
{
|
||||
"size": 269,
|
||||
"digest": "0c21a793d87773b3ed82d141bea33869a6b647e5dddab3ecfee1738751e5c8d3d0b9ca45d7453ef88d335949c73f935c37de3521978b318ca51d8369be894b92",
|
||||
"algorithm": "sha512",
|
||||
"filename": "setup.sh"
|
||||
}
|
||||
]
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче