summaryrefslogtreecommitdiffstats
path: root/NativeCode.mk
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2010-11-05 10:49:14 -0700
committerElliott Hughes <enh@google.com>2010-11-08 15:49:50 -0800
commit95101d3d5a3417755c88fded1600e039fb363019 (patch)
tree899cc995f25e1f5295204cb78c094b625012676c /NativeCode.mk
parentee6ee465591be420db0094627deb5079bc978926 (diff)
downloadlibcore-95101d3d5a3417755c88fded1600e039fb363019.zip
libcore-95101d3d5a3417755c88fded1600e039fb363019.tar.gz
libcore-95101d3d5a3417755c88fded1600e039fb363019.tar.bz2
Rewrite File.getCanonicalPath.
My original plan was to just rely on the fixed realpath(3), but it turns out that Java's behavior is quite different from the C library's in cases where path elements don't exist. I also wasn't particularly excited about introducing a fixed-length buffer. To that end, I've added a native implementation of getCanonicalPath. I've also improved the getAbsolutePath and getCanonicalPath documentation. This patch also makes File.absolutePath transient, a regression in gingerbread which uselessly bloated File's serialized form. Bug: 2281992 Change-Id: Iff94eee07fe574251c1188b2b2eb71f585c81c6a
Diffstat (limited to 'NativeCode.mk')
-rw-r--r--NativeCode.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/NativeCode.mk b/NativeCode.mk
index 4c6ffa5..57c2457 100644
--- a/NativeCode.mk
+++ b/NativeCode.mk
@@ -94,8 +94,8 @@ endif
# Define the rules.
LOCAL_SRC_FILES := $(core_src_files)
-LOCAL_C_INCLUDES := $(core_c_includes)
-LOCAL_SHARED_LIBRARIES := $(core_shared_libraries)
+LOCAL_C_INCLUDES := $(core_c_includes) bionic/ bionic/libstdc++/include external/stlport/stlport
+LOCAL_SHARED_LIBRARIES := $(core_shared_libraries) libstlport
LOCAL_STATIC_LIBRARIES := $(core_static_libraries)
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libjavacore