ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am f2af88e8: Tracking merge of dalvik-dev to gingerbread

Browse source 
Merge commit 'f2af88e81af5efb2d585963507f798d5a8b93d67' into gingerbread-plus-aosp

* commit 'f2af88e81af5efb2d585963507f798d5a8b93d67':
  Tracking merge of dalvik-dev to gingerbread
This commit is contained in:
Brian Carlstrom 2010-08-05 10:39:18 -07:00 • committed by Android Git Automerger
commit 3c659a8d64
3 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/cutils/mspace.h
View file

@ -87,6 +87,11 @@ mspace create_contiguous_mspace_with_base(size_t starting_capacity,
size_t max_capacity, int locked, void *base); size_t max_capacity, int locked, void *base);
size_t destroy_contiguous_mspace(mspace msp); size_t destroy_contiguous_mspace(mspace msp);
/*
Returns the position of the "break" within the given mspace.
*/
void *contiguous_mspace_sbrk0(mspace msp);
#endif #endif
/* /*

12
libcutils/mspace.c
View file

@ -271,4 +271,16 @@ size_t destroy_contiguous_mspace(mspace msp) {
} }
return 0; 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 #endif

2
rootdir/init.rc
View file

@ -17,7 +17,7 @@ loglevel 3
export EXTERNAL_STORAGE /mnt/sdcard export EXTERNAL_STORAGE /mnt/sdcard
export ASEC_MOUNTPOINT /mnt/asec export ASEC_MOUNTPOINT /mnt/asec
export LOOP_MOUNTPOINT /mnt/obb 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 # Backward compatibility
symlink /system/etc /etc symlink /system/etc /etc