Merge commit 'd83f33969aa2734000338e01b84957996ef1bb34' into gingerbread
* commit 'd83f33969aa2734000338e01b84957996ef1bb34':
Revert "Merge "Switch the required host Java environment to 1.6." into kraken"
1. Set correct aidl_preprocess_import for LOCAL_SDK_VERSION current.
2. Set correct PRIVATE_BOOTCLASSPATH for non-empty LOCAL_SDK_VERSION.
Change-Id: Iff8e266931434863521bfa4621767bed31d31cc0
Merge commit '04be0d869acce82293b6c668f52bddf14c106908' into kraken
* commit '04be0d869acce82293b6c668f52bddf14c106908':
Set JAVA_HOME to point to java 1.5.
Merge commit '4873d8f5ca9fecc9c826ad383befbefb3407296b' into kraken
* commit '4873d8f5ca9fecc9c826ad383befbefb3407296b':
Build host tools as 32bit on all Darwin machines.
Added "TARGET_CPU_SMP := true" to simulator configuration, since it's
likely the simulator will be running on SMP hardware.
Change-Id: I7527895abe70ffaece5c52fd3ffcfe4b0d698fd2
Merge commit '0c5363c8571eef11eeb21a575da941565c34191e' into kraken
* commit '0c5363c8571eef11eeb21a575da941565c34191e':
Add QuickSearchBox to the SDK build.
Merge commit '8e5605a774fd2f61c6d5bae0440b20fc0bdd79f7' into froyo-plus-aosp
* commit '8e5605a774fd2f61c6d5bae0440b20fc0bdd79f7':
Add QuickSearchBox to the SDK build.
Added prelink map entry for libeffects.so. This library contains the
effect factory needed to load plugin effect libraries.
Also remove obsolete entry for libaudiopolicygeneric.so library.
Change-Id: I65db56eec2c1ff1b50c6da0572492138d3e00607
Merge commit 'd44754e0e5e11c33c0ede3eb7e168a301e59a3cf' into kraken
* commit 'd44754e0e5e11c33c0ede3eb7e168a301e59a3cf':
Doc change: add tv assets for carousel.
Merge commit 'e9b01eb46d461e7cfecb365acf046e2ad56c05a0' into froyo-plus-aosp
* commit 'e9b01eb46d461e7cfecb365acf046e2ad56c05a0':
Doc change: add tv assets for carousel.
Merge commit 'e5cfdbfb17b3915b86d8a5eacee0bf1391504795' into kraken
* commit 'e5cfdbfb17b3915b86d8a5eacee0bf1391504795':
Doc change: Update froyo mark for home
Merge commit '9d1d6441d97eeea80c70c549646d7c177936e148' into froyo-plus-aosp
* commit '9d1d6441d97eeea80c70c549646d7c177936e148':
Doc change: Update froyo mark for home
commit 7401608f3b9b52b3348e32ec9fefe7583d6c2fa4
Author: Guang Zhu <guangzhu@google.com>
Date: Fri Apr 23 11:54:37 2010 -0700
collect emm meta files for emma instrumented build
when doing 'make dist', with EMMA_INSTRUMENT on the coverage.em files
generated for each module will be collected into one emma_meta.zip file
Change-Id: I382c39a97005e6cae5c79ad7eaef1c8857f658af
commit 8376d70938f6507d54b66fe5832a637aa883974e
Author: Guang Zhu <guangzhu@google.com>
Date: Wed Mar 10 15:48:03 2010 -0800
enhancement for building app with emma code coverage
* global filter to avoid applying instrumentation on emma classes
* remove local variable information at dex step instead of compile time
Change-Id: If04c27bc717f34816077a98ead9ceb0dbcbb0d2f
Change-Id: I971bd0f291bede2568b21347247d37a7d035c661