summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Mesnier <mesnier_p@ociweb.com>2011-08-17 15:01:45 +0000
committerPhil Mesnier <mesnier_p@ociweb.com>2011-08-17 15:01:45 +0000
commit3629985235a2b0ec6f63754725ad4653185c2049 (patch)
tree80e45a9b907a2ecaa529e6ddb33ddbb3a5f8c9e6
parente7b77a9e3c2afd6ad97f0ba9d1c6fce34944bccb (diff)
downloadATCD-3629985235a2b0ec6f63754725ad4653185c2049.tar.gz
Wed Aug 17 15:01:28 UTC 2011 Phil Mesnier <mesnier_p@ociweb.com>
* ACE-INSTALL.html: Fix typo in SYSROOT default example.
-rw-r--r--ACE/ACE-INSTALL.html2
-rw-r--r--ACE/ChangeLog6
2 files changed, 7 insertions, 1 deletions
diff --git a/ACE/ACE-INSTALL.html b/ACE/ACE-INSTALL.html
index 8a1e4b42c3c..e9eae043694 100644
--- a/ACE/ACE-INSTALL.html
+++ b/ACE/ACE-INSTALL.html
@@ -1827,7 +1827,7 @@ cross compiling the code.<p>
<li>$ANDROID_ARCH - either arm or x86. Note that x86 is only available in r6 and greater, and is still experimental. ANDROID_ARCH will be set to arm by default.</li>
<li>$NDK - the path to the android native development kit</li>
<li>$SDK - the path to the android software development kit</li>
- <li>$SYSROOT - the platform/arch directory. This defaults to <code>$NDK/platforms/android-9/arch_$ANDROID_ARCH</code>. </li>
+ <li>$SYSROOT - the platform/arch directory. This defaults to <code>$NDK/platforms/android-9/arch-$ANDROID_ARCH</code>. </li>
<li>$HOST_ROOT - the path to the native TAO_IDL & gperf tools</li>
<li>$NDK_TOOLS - the path to the standalone toolchain created as shown above.</li>
<li>$PATH - must include <code>$NDK_TOOLS/bin</code>.</li>
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 6faa964331b..8af65788180 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,9 @@
+Wed Aug 17 15:01:28 UTC 2011 Phil Mesnier <mesnier_p@ociweb.com>
+
+ * ACE-INSTALL.html:
+
+ Fix typo in SYSROOT default example.
+
Wed Aug 17 13:54:12 UTC 2011 Phil Mesnier <mesnier_p@ociweb.com>
* ace/Message_Block.cpp: