diff options
| -rw-r--r-- | include/cutils/mspace.h | 5 | ||||
| -rw-r--r-- | libcutils/mspace.c | 12 | ||||
| -rw-r--r-- | rootdir/init.rc | 2 |
3 files changed, 18 insertions, 1 deletions
diff --git a/include/cutils/mspace.h b/include/cutils/mspace.h index e6e4047..93fe48e 100644 --- a/include/cutils/mspace.h +++ b/include/cutils/mspace.h @@ -87,6 +87,11 @@ mspace create_contiguous_mspace_with_base(size_t starting_capacity, size_t max_capacity, int locked, void *base); size_t destroy_contiguous_mspace(mspace msp); + +/* + Returns the position of the "break" within the given mspace. +*/ +void *contiguous_mspace_sbrk0(mspace msp); #endif /* diff --git a/libcutils/mspace.c b/libcutils/mspace.c index 63b199d..6d3b35c 100644 --- a/libcutils/mspace.c +++ b/libcutils/mspace.c @@ -271,4 +271,16 @@ size_t destroy_contiguous_mspace(mspace msp) { } return 0; } + +void *contiguous_mspace_sbrk0(mspace msp) { + struct mspace_contig_state *cs; + mstate ms; + const unsigned int pagesize = PAGESIZE; + + ms = (mstate)msp; + cs = (struct mspace_contig_state *)((uintptr_t)ms & ~(pagesize-1)); + assert(cs->magic == CONTIG_STATE_MAGIC); + assert(cs->m == ms); + return cs->brk; +} #endif diff --git a/rootdir/init.rc b/rootdir/init.rc index 4a88513..1e3e2d2 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -17,7 +17,7 @@ loglevel 3 export EXTERNAL_STORAGE /mnt/sdcard export ASEC_MOUNTPOINT /mnt/asec export LOOP_MOUNTPOINT /mnt/obb - export BOOTCLASSPATH /system/framework/core.jar:/system/framework/ext.jar:/system/framework/framework.jar:/system/framework/android.policy.jar:/system/framework/services.jar + export BOOTCLASSPATH /system/framework/core.jar:/system/framework/bouncycastle.jar:/system/framework/ext.jar:/system/framework/framework.jar:/system/framework/android.policy.jar:/system/framework/services.jar:/system/framework/core-junit.jar # Backward compatibility symlink /system/etc /etc |