Merge commit 'ebb0b03e170b724e04a0d44bfd1ccb02452f5f57'
* commit 'ebb0b03e170b724e04a0d44bfd1ccb02452f5f57':
Prepare for a new IActivityController method.
Merge commit 'd424b8d9ccb569c4a2f01de248068fd130e3bd82' into gingerbread-plus-aosp
* commit 'd424b8d9ccb569c4a2f01de248068fd130e3bd82':
Prepare for a new IActivityController method.
This commit removes duplication of system headers per platform, i.e. remove
copies of common headers like <stdlib.h> from arch-arm/usr/include and arch-x86/usr/include
and move them to a common include directory. More specifically:
- common headers: android-N/arch-A/usr/include --> android-N/include
- arch-specific headers: android-N/arch-A/usr-include --> android-N/arch-A/include
- arch-specific libs: android-N/arch-A/usr/lib --> android-N/arch-A/lib
Change-Id: Ifdba5038d108901931f3e3a7c14ebe6270d2d276
NOTE: This also contains careful separation of API-level-specific headers.
For example, platforms/android-5/include/pthread.h contains new function
declarations that are not available when using platforms/android-3/include/pthread.h
NOTE: The NDK's build-platforms.sh script has been updated to understand the new
layout. This change in develeopment/ndk does not change the layout of
platform files under $NDK/platforms after build-platforms.sh is called.
This is to reflect the simplification in prebuilt support.
1/ LOCAL_SRC_FILES is relative to LOCAL_PATH, like with other module types
2/ no need for LOCAL_PREBUILTS
Change-Id: If7302fe355cb25a446e31c20015098db75c00c02
Merge commit '14282f9796f888c3388d25a878b625fd76840212' into gingerbread-plus-aosp
* commit '14282f9796f888c3388d25a878b625fd76840212':
Change hosttestlib to use ddm-prebuilt.
Merge commit '9b2d35f0a81cb0483337ab0a776c5e9287e84dbf' into gingerbread-plus-aosp
* commit '9b2d35f0a81cb0483337ab0a776c5e9287e84dbf':
DO NOT MERGE Classpath cleanup in libcore
Merge commit '66ce420c325fe32a4da67f8a9a0914a093df2f42'
* commit '66ce420c325fe32a4da67f8a9a0914a093df2f42':
Cleanups for eclipse classpath DO NOT MERGE
Merge commit 'd59647505dff76ebb2e8da489fabf6bf5ddb0d1f' into gingerbread-plus-aosp
* commit 'd59647505dff76ebb2e8da489fabf6bf5ddb0d1f':
Package Proguard with the SDK.
Merge commit '434450f73adf9306241ea44ec389bfdd7a6cd765'
* commit '434450f73adf9306241ea44ec389bfdd7a6cd765':
Update NDK headers and samples to sync up with looper API changes.
Merge commit '2405e67fad64b62efa71f04aab712fd9d80803df' into gingerbread-plus-aosp
* commit '2405e67fad64b62efa71f04aab712fd9d80803df':
Update NDK headers and samples to sync up with looper API changes.
Merge commit '3d925ea9e884000a7e5e8e18c681967f9550b15d'
* commit '3d925ea9e884000a7e5e8e18c681967f9550b15d':
GlobalTime: Perform Zoom In and Out only after initialization
Merge commit '915bdba9ac6c272fc127ab39b9a8019b7ad24e61'
* commit '915bdba9ac6c272fc127ab39b9a8019b7ad24e61':
Use remote_api for shell access on developer.android.com.
Merge commit '50d579d0ec9c9d0bcd3da936af8480808d5e0843' into gingerbread-plus-aosp
* commit '50d579d0ec9c9d0bcd3da936af8480808d5e0843':
GlobalTime: Perform Zoom In and Out only after initialization
Merge commit '12d3ad89e48e4e95a1ebf78fad1978e9e5e56a3d' into gingerbread-plus-aosp
* commit '12d3ad89e48e4e95a1ebf78fad1978e9e5e56a3d':
Use remote_api for shell access on developer.android.com.
