Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
branch: ics-devel
Commits on Jul 12, 2012
  1. @existz

    Merge remote branch 'remotes/aosp/master' into merge_branch

    existz authored
    Conflicts:
    	Android.mk
  2. @digit-android

    Merge "Fix _STLP_USE_EXCEPTIONS"

    digit-android authored android code review committed
Commits on Jul 6, 2012
  1. Fix _STLP_USE_EXCEPTIONS

    Duane Sand authored
    When _STLP_USE_EXCEPTIONS is not defined, omit all declarations
    and uses of __Named_exception.  Compile and use __Named_exception
    only when STLport is being allowed to use exceptions, but not the
    host compiler's native version.
    
    Change-Id: I71963ca15d535d3ae1717c5bb22fe5fa3add41cb
Commits on Jul 3, 2012
  1. am fe81d3d: Merge "[MIPS] Use NDK libs for ARM builds only"

    Andrew Hsieh authored Android Git Automerger committed
    * commit 'fe81d3d78891b3b5025a6ca24736cad8d5bf9f25':
      [MIPS] Use NDK libs for ARM builds only
Commits on Jul 2, 2012
  1. Merge "[MIPS] Use NDK libs for ARM builds only"

    Andrew Hsieh authored android code review committed
Commits on Jun 29, 2012
  1. am 2ee723b: Merge "[MIPS] enable STL build for Android"

    Andrew Hsieh authored Android Git Automerger committed
    * commit '2ee723b69a4538f5b7c77bb95294e27655778633':
      [MIPS] enable STL build for Android
  2. Merge "[MIPS] enable STL build for Android"

    Andrew Hsieh authored android code review committed
  3. @chrisdearman

    [MIPS] enable STL build for Android

    chrisdearman authored Duane Sand committed
    Signed-off-by: Chris Dearman <chris@mips.com>
    
    The conditional compilation of __Named_exception has been broken since
    STLport release 5.1.0 in Nov 2005.  This class has been unconditionally
    included for all non-Mips compilers on all platforms, which was not the
    original intent.  Since then, changes elsewhere in _ios_base.h and _exception.h
    have (unintentionally?) required __Named_exception in all uses, but this
    went unnoticed until the Mips port of Android.
    
    The current change has the same treatment of __Named_exception on all
    platforms and compilers, including Mips Android gcc, and also the
    SGI o32 Ugen compiler.  An identical (unexplained) change by Mips is
    in the NDK copy of STLport.
    
    The conditional compilation checks around definitions and use of
    __Named_exception should someday be made identical, by the STLport designer.
    
    The condition
       !(defined(_MIPS_SIM) && defined(_ABIO32) && (_MIPS_SIM == _ABIO32))
    is not obvious.  This dates from v3.11 in July 1998 when this STL
    library was only for SGI machines.  It was then a test of whether the
    code was being compiled by Mips' original 32-bit-ABI Ugen compier,
    or instead SGI's second-generation MIPSpro compiler.  The reason
    for handling these compilers differently is not documented anywhere,
    but was likely a workaround for some issue in one compiler.
    These same flags are now defined by gcc compilers for Mips.
    
    It is safe to now eliminate the ABIO32 check, because no active STLport
    users have tried building with the Ugen compiler for many years
    (otherwise they would have encountered build errors).
    
    Change-Id: I38474a6b6616714fe3a611100adacf418cc3ae1d
Commits on Jun 5, 2012
  1. am ec42173: Replaced one exit() call with abort()

    James Dong authored Android Git Automerger committed
    * commit 'ec42173ef0955aa1844e0be303363c7e5dc98fb7':
      Replaced one exit() call with abort()
Commits on Jun 2, 2012
  1. Replaced one exit() call with abort()

    James Dong authored
    Don't know it help eliminate the silent native crash from mediaserver process;
    but exit() is evil and we should replace it anyway
    
    Change-Id: Ia253d2d320f3cf63f26952ddffe3f1248d3610a3
Commits on May 22, 2012
  1. am 12a79bb: Merge "Back-port NDK STLport template fix."

    Andrew Hsieh authored Android Git Automerger committed
    * commit '12a79bbd8afb69b4221a541be1c8ad37e96e3330':
      Back-port NDK STLport template fix.
  2. Merge "Back-port NDK STLport template fix."

    Andrew Hsieh authored android code review committed
Commits on May 9, 2012
  1. Back-port NDK STLport template fix.

    David 'Digit' Turner authored
    This is a back-port of NDK patch afba0d11e83793cb472bef0fafba207857875239
    
        Avoid instantiating the pointed-to type in _StorageType
    
        _StorageType<_Tp*> instantiates _Tp to perform argument dependent lookup of
        _UseVoidPtrStorageType. This is (a) unneeded, and (b) will result in a
        compilation failure if instantiation of _Tp references other fields of
        _StorageType<_Tp*> (which is incomplete at this time).
    
        This change references the function by its fully-qualified name, thus disabling
        argument dependent lookup.
    
        Upstream bug:
        https://sourceforge.net/tracker/index.php?func=detail&aid=3497008&group_id=146814&atid=766244
    
    Change-Id: Ic097ad0e413d9f82cbcd5de4379f5a39e395501f
Commits on Apr 6, 2012
  1. Add NOTICE file

    Wei Zhong authored
    Copied from LICENSE.
    
    Bug: 6299628
    
    Change-Id: I31a2602e386b9bc1287972273978192d2d5fbc4e
    Signed-off-by: Wei Zhong <wzhong@google.com>
    (cherry picked from commit 529d5e56073eafce66b11344a26b694f02c21127)
Commits on Feb 18, 2012
  1. @xoomdev

    stlport: Don't force use of the prebuilt compiler

    Bernhard Rosenkraenzer authored xoomdev committed
    Using the prebuilt compiler doesn't make sense and actually breaks
    the build with gcc 4.7. (This should provide a little speedup on
    4.6 builds as well)
    
    Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
  2. @xoomdev

    stlport: Force building PIC code

    Bernhard Rosenkraenzer authored xoomdev committed
    Required for gcc 4.7
    
    Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Commits on Feb 14, 2012
  1. @xoomdev

    stlport: Remove executable bit on Android.mk

    Bernhard Rosenkraenzer authored xoomdev committed
    There's no reason to make a Makefile executable - so
    don't do it
    
    Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
  2. @xoomdev

    stlport: Fix strict aliasing violations

    Chao Yang authored xoomdev committed
    This patch fixes strict aliasing violations.
    Forward-ported from Chao Yang <chao.yang@linaro.org>'s
    patch for 2.3.5.
    
    Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Commits on Feb 1, 2012
  1. @chrisdearman

    [MIPS] Use NDK libs for ARM builds only

    chrisdearman authored Bhanu Chetlapalli committed
    Signed-off-by: Chris Dearman <chris@mips.com>
Commits on Jan 12, 2012
  1. Merge "Revert "Add X86 target changes""

    Jean-Baptiste Queru authored android code review committed
  2. @cwhuang

    Revert "Add X86 target changes"

    cwhuang authored Chih-Wei Huang committed
    Since ICS x86 has a newer toolchain gcc 4.4.3.
    The workaround should be removed.
    
    This reverts commit daf6f40.
    
    Change-Id: I9c1549d522b46b0943bdf80b9a74525e73ce8dc2
Commits on Sep 15, 2011
  1. Merge "Bugfix: == vs = mixup."

    David Turner authored Android (Google) Code Review committed
Commits on Aug 29, 2011
  1. Fix an instantiation of an incomplete type.

    Evgeniy Stepanov authored
    This fixes an implicit instantiation of undefined template
    basic_string<...> in locale::combine. This results in a compilation
    error from clang.
    
    Upstream bug:
    https://sourceforge.net/tracker/?func=detail&aid=3400141&group_id=146814&atid=766244
    
    Change-Id: I06193cbaafdc5c11adf664e6311e990068d63f03
  2. Bugfix: == vs = mixup.

    Evgeniy Stepanov authored
    Upstream bug:
    https://sourceforge.net/tracker/?func=detail&aid=3307460&group_id=146814&atid=766244
    
    Change-Id: Idf58d7e58c1db6f9740dd44eafa69ef4e6a43e36
Commits on Jul 17, 2011
  1. Add private copies of sincos*(). We need these to build libstlport.so…

    Doug Kwan authored
    … with
    
    gcc 4.6 correctly.
    
    Change-Id: If080ec0540a65327147c7bb4c9bb954ccb20bd95
Commits on Jul 15, 2011
  1. @kruton

    Merge "Use memmove instead of memcpy in string::assign."

    kruton authored Android (Google) Code Review committed
Commits on Jul 13, 2011
  1. am dd24e27: am c67a10e: resolved conflicts for merge of aaea6ca to gi…

    David 'Digit' Turner authored Android Git Automerger committed
    …ngerbread-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
Commits on Jul 12, 2011
  1. Remove the simulator target from all makefiles.

    Jeff Brown authored
    Bug: 5010576
    
    Change-Id: Ia2e7e373ce5c415ba6bf3e457f82ffe64d279439
Commits on Jul 11, 2011
  1. am c67a10e: resolved conflicts for merge of aaea6ca to gingerbread-pl…

    David 'Digit' Turner authored Android Git Automerger committed
    …us-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
  2. resolved conflicts for merge of aaea6ca to gingerbread-plus-aosp

    David 'Digit' Turner authored
    Change-Id: I2c0d5cbed821bb4f5c89339e440dba92a6f2aa2c
Commits on Jul 8, 2011
  1. merge intel x86 patches into gingerbread branch

    David 'Digit' Turner authored
Commits on Jun 22, 2011
  1. Use memmove instead of memcpy in string::assign.

    Evgeniy Stepanov authored
    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
Commits on Jun 8, 2011
  1. Use the standard NDK,SDK versions so that we pick up the correct crt …

    Bruce Beare authored David 'Digit' Turner committed
    …files
    
    Change-Id: I86bed83657dc8dab7ba4dcbe8d9c37fb7d6e1ed5
    Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
  2. Use __ANDROID__ to prepare for upcoming arm_linux_androideabi toolchain.

    Jing Yu authored David 'Digit' Turner committed
    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
  3. Don't use stale NDK libraries for IA

    Bruce Beare authored David 'Digit' Turner committed
    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>
Something went wrong with that request. Please try again.