Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2af88e8 authored by Brian Carlstrom's avatar Brian Carlstrom
Browse files

Tracking merge of dalvik-dev to gingerbread 

git cherry-pick --no-commit b99a099c
git cherry-pick --no-commit 9811671e
git cherry-pick --no-commit d0645bf0

Change-Id: Ie70fecaeaba97a25f114cd2717e381b5107533b1
parent 5a0adf95

include/cutils/mspace.h

+5 −0
Original line number Diff line number Diff line
@@ -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



/*

libcutils/mspace.c

+12 −0
Original line number Diff line number Diff line
@@ -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

rootdir/init.rc

+1 −1
Original line number Diff line number Diff line
@@ -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