diff options
| author | Elliott Hughes <enh@google.com> | 2011-03-14 18:24:10 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2011-03-14 18:54:48 -0700 |
| commit | f934c3d2c8dd9e6bc5299cef41adace2a671637d (patch) | |
| tree | d3051a679d75642e6af37a2560917b536ea5a30f /luni/src/main/native/Register.cpp | |
| parent | 03dbe962bc5a38c95037646e1dfe1d65ddc9c692 (diff) | |
| download | libcore-f934c3d2c8dd9e6bc5299cef41adace2a671637d.zip libcore-f934c3d2c8dd9e6bc5299cef41adace2a671637d.tar.gz libcore-f934c3d2c8dd9e6bc5299cef41adace2a671637d.tar.bz2 | |
Make OSMemory the semi-supported libcore.io.Memory.
Looks like we're not going to bother with a separate libcore.os package,
when libcore.io will do.
Change-Id: I2806c59349ed4b6410d768c4207c384ced973c54
Diffstat (limited to 'luni/src/main/native/Register.cpp')
| -rw-r--r-- | luni/src/main/native/Register.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/luni/src/main/native/Register.cpp b/luni/src/main/native/Register.cpp index bee4aea..24e6faf 100644 --- a/luni/src/main/native/Register.cpp +++ b/luni/src/main/native/Register.cpp @@ -53,10 +53,10 @@ extern int register_libcore_icu_NativeNormalizer(JNIEnv* env); extern int register_libcore_icu_NativePluralRules(JNIEnv* env); extern int register_libcore_icu_TimeZones(JNIEnv* env); extern int register_libcore_io_IoUtils(JNIEnv* env); +extern int register_libcore_io_Memory(JNIEnv* env); extern int register_libcore_net_RawSocket(JNIEnv* env); extern int register_org_apache_harmony_dalvik_NativeTestTarget(JNIEnv* env); extern int register_org_apache_harmony_luni_platform_OSFileSystem(JNIEnv* env); -extern int register_org_apache_harmony_luni_platform_OSMemory(JNIEnv* env); extern int register_org_apache_harmony_luni_platform_OSNetworkSystem(JNIEnv* env); extern int register_org_apache_harmony_luni_util_fltparse(JNIEnv* env); extern int register_org_apache_harmony_xml_ExpatParser(JNIEnv* env); @@ -101,10 +101,10 @@ extern "C" int registerCoreLibrariesJni(JNIEnv* env) { register_libcore_icu_NativePluralRules(env) != -1 && register_libcore_icu_TimeZones(env) != -1 && register_libcore_io_IoUtils(env) != -1 && + register_libcore_io_Memory(env) != -1 && register_libcore_net_RawSocket(env) != -1 && register_org_apache_harmony_dalvik_NativeTestTarget(env) != -1 && register_org_apache_harmony_luni_platform_OSFileSystem(env) != -1 && - register_org_apache_harmony_luni_platform_OSMemory(env) != -1 && register_org_apache_harmony_luni_platform_OSNetworkSystem(env) != -1 && register_org_apache_harmony_luni_util_fltparse(env) != -1 && register_org_apache_harmony_xml_ExpatParser(env) != -1 && |