am 23d26c04: Merged prebuilt NDKs for different Build OS.

Merge commit '23d26c04304e90e94e9f7ff4dbddde644010660b' into gingerbread-plus-aosp

* commit '23d26c04304e90e94e9f7ff4dbddde644010660b':
  Merged prebuilt NDKs for different Build OS.
am 5611a6e8: am 23d26c04: Merged prebuilt NDKs for different Build OS.

Merge commit '5611a6e8270af77759dc128749a5a92d3881cbea'

* commit '5611a6e8270af77759dc128749a5a92d3881cbea':
  Merged prebuilt NDKs for different Build OS.
Don't use stale NDK libraries for IA

IA builds will break (due to the bionic _dso_handle bug) if stale libraries are
used. For now, just guard the defns against IA builds.
Change-Id: I03eac990299fce98f467c65707423a9880203f8b
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Merge "Don't use stale NDK libraries for IA"
Don't use stale NDK libraries for IA

IA builds will break (due to the bionic _dso_handle bug) if stale libraries are
used. For now, just guard the defns against IA builds.

Change-Id: Ideafe60b1537a538513e88de045f9560bb3c1621
am 534b7341: Merge "Don\'t use stale NDK libraries for IA"

* commit '534b7341a1d4b2972d373e5d5f10452b245a6c50':
  Don't use stale NDK libraries for IA
Add X86 target changes

Our X86 toolchain uses GCC 4.2.1 which apparently has a bug calling
const constructors. Luckily STLport has a work-around.

Change-Id: I0b75d01ced7ac20343bfecca947efec97908056e
Turn off container extension which fails correct and standard-compliant code.

Note: Container extension uses template member function to implement
insert, find, ... member functions of the containers.
Don't use stale NDK libraries for IA

IA builds will break (due to the bionic _dso_handle bug) if stale libraries are
used. For now, just guard the defns against IA builds.
Orig-Change-Id: I03eac990299fce98f467c65707423a9880203f8b
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Use __ANDROID__ to prepare for upcoming arm_linux_androideabi toolchain.

This patch does not affect current arm-eabi toolchain behavior at all.
It only makes arm_linux_androideabi toolchain to do the same as arm-eabi does.

The current arm_eabi toolchain does not define __unix nor __unix__, so
some statements wrapped by "#if defined (__unix) || defined (__unix__)"
"#endif" won't be included. However, the new arm_linux_androideabi
targets a linux Android platform, where __unix and __unix__ are
defined, which results in the incorrectly inclusion of calls of
IsNANorINF, IsINF, IsNegNAN, ecvt_r, fcvt_r, etc. We need to add
__ANDROID__ to prevent these calls from being included.

As a background, arm_linux_androideabi will be supported by upstream gcc
trunk soon. __ANDROID__ is defined by arm_linux_androideabi toolchain.

Orig-Change-Id: I94d3ed2e24b7c25e01ebb5a4dc8d2d568fd09e22
Use the standard NDK,SDK versions so that we pick up the correct crt files

Change-Id: I86bed83657dc8dab7ba4dcbe8d9c37fb7d6e1ed5
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Use memmove instead of memcpy in string::assign.

It is possible to assign a string part of its own buffer:
std::string s; s.assign(s.data(), s.size());
This can not be done with memcpy.

Upstream bug:
https://sourceforge.net/tracker/?func=detail&aid=3323109&group_id=146814&atid=766244

Change-Id: I611b1c08664c9eacb7ded6821ef2ef555a3288a8
merge intel x86 patches into gingerbread branch
resolved conflicts for merge of aaea6ca1 to gingerbread-plus-aosp

Change-Id: I2c0d5cbed821bb4f5c89339e440dba92a6f2aa2c
am c67a10e6: resolved conflicts for merge of aaea6ca1 to gingerbread-plus-aosp

* commit 'c67a10e6a443042414ddb3322de51b8ccdba8b21':
  Use the standard NDK,SDK versions so that we pick up the correct crt files
  Use __ANDROID__ to prepare for upcoming arm_linux_androideabi toolchain.
  Don't use stale NDK libraries for IA
Remove the simulator target from all makefiles.
Bug: 5010576

Change-Id: Ia2e7e373ce5c415ba6bf3e457f82ffe64d279439
am dd24e27d: am c67a10e6: resolved conflicts for merge of aaea6ca1 to gingerbread-plus-aosp

* commit 'dd24e27dd68adc52b2904e776ab5dd41895c224b':
  Use the standard NDK,SDK versions so that we pick up the correct crt files
  Use __ANDROID__ to prepare for upcoming arm_linux_androideabi toolchain.
  Don't use stale NDK libraries for IA
Merge "Use memmove instead of memcpy in string::assign."
Add private copies of sincos*().  We need these to build libstlport.so with
gcc 4.6 correctly.

Change-Id: If080ec0540a65327147c7bb4c9bb954ccb20bd95
Bugfix: == vs = mixup.

Upstream bug:
https://sourceforge.net/tracker/?func=detail&aid=3307460&group_id=146814&atid=766244

Change-Id: Idf58d7e58c1db6f9740dd44eafa69ef4e6a43e36