Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
halo
ndk
Commits
76370ba5
Commit
76370ba5
authored
15 years ago
by
David 'Digit' Turner
Browse files
Options
Download
Email Patches
Plain Diff
Fix windows NDK build - add runtime check for Cygwin 1.5
Change-Id: I73107f2f72ec3b3486e59f80b942f041cf65b02d
parent
2e063fe1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
3 deletions
+22
-3
build/core/init.mk
build/core/init.mk
+17
-0
docs/CHANGES.TXT
docs/CHANGES.TXT
+4
-0
docs/INSTALL.TXT
docs/INSTALL.TXT
+1
-3
No files found.
build/core/init.mk
View file @
76370ba5
...
...
@@ -147,6 +147,23 @@ else
endif
HOST_TAG
:=
$(HOST_OS)
-
$(HOST_ARCH)
# If we are on Windows, we need to check that we are not running
# Cygwin 1.5, which is deprecated and won't run our toolchain
# binaries properly.
#
ifeq
($(HOST_TAG),windows-x86)
# On cygwin, 'uname -r' returns something like 1.5.23(0.225/5/3)
# We recognize 1.5. as the prefix to look for then.
CYGWIN_VERSION
:=
$(
shell
uname
-r
)
ifneq
($(filter XX1.5.%,XX$(CYGWIN_VERSION)),)
$(call
__ndk_info,You
seem
to
be
running
Cygwin
1.5,
which
is
not
supported.)
$(call
__ndk_info,Please
upgrade
to
Cygwin
1.7
or
higher.)
$(call
__ndk_error,Aborting.)
endif
# special-case the host-tag
HOST_TAG
:=
windows
endif
$(call
ndk_log,HOST_TAG
set
to
$(HOST_TAG))
#
...
...
This diff is collapsed.
Click to expand it.
docs/CHANGES.TXT
View file @
76370ba5
...
...
@@ -10,6 +10,10 @@ IMPORTANT BUG FIXES:
IMPORTANT CHANGES:
- On Windows, Cygwin 1.7 or higher is now required. The NDK will not
work properly with Cygwin 1.5 which is now officially obsolete
anyway.
- Simplified build system: You no longer need to run build/host-setup.sh
or modify anything under $NDK_ROOT/apps/. Instead, just invoke the
new 'ndk-build' script from your application's project directory, or
...
...
This diff is collapsed.
Click to expand it.
docs/INSTALL.TXT
View file @
76370ba5
...
...
@@ -13,9 +13,7 @@ I. Requirements:
The Android NDK currently requires a Linux, OS X or Windows host operating system.
Windows users will need to install Cygwin 1.7 or later (http://www.cygwin.com) to
use the NDK. Note that running it under MSys is not supported. Running under the
now-obsolete Cygwin 1.5 has not been tested and might not work. Consider upgrading
to 1.7 instead in case of problems.
use the NDK. Note that running it under MSys or Cygwin 1.5 is not supported.
You will need to have the Android SDK and its dependencies installed. The NDK
cannot generate final application packages (.apk files), only the shared library
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment