OSDN Git Service
(root)
/
android-x86
/
ndk.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
dfc478b
)
Merge "ndk-build: On Windows, check that a Cygwin-compatible GNU Make is being used...
author
David 'Digit' Turner
<digit@google.com>
Wed, 9 Jun 2010 00:56:45 +0000
(17:56 -0700)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Wed, 9 Jun 2010 00:56:45 +0000
(17:56 -0700)
docs/ANDROID-MK.TXT
patch
|
blob
|
history
diff --git
a/docs/ANDROID-MK.TXT
b/docs/ANDROID-MK.TXT
index
03c34c7
..
3857385
100644
(file)
--- a/
docs/ANDROID-MK.TXT
+++ b/
docs/ANDROID-MK.TXT
@@
-125,8
+125,8
@@
that will be passed directly to a compiler, and you should be good.
Note that the default extension for C++ source files is '.cpp'. It is
however possible to specify a different one by defining the variable
-LOCAL_
DEFAULT_CPP_EXTENSION. Don't forget the initial dot (i.e. '.cxx'
-w
ill w
ork, but not 'cxx').
+LOCAL_
CPP_EXTENSION. Don't forget the initial dot (i.e. '.cxx' will
+work, but not 'cxx').
include $(BUILD_SHARED_LIBRARY)