summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-10-06Merge "Disable Clang compilation."HEADandroid-l-preview_r2mastermainl-previewChih-Hung Hsieh
2014-10-03Disable Clang compilation.Chih-Hung Hsieh
Before all the errors are fixed upstream, we disable Clang here to test first other AOSP projects. Change-Id: I12109cafdef6bbb3d54cb83fcc1448ff3e4236e3
2014-09-26Merge "Don't manually link stlport."Dan Albert
2014-09-26Don't manually link stlport.Dan Albert
Change-Id: Ibddc5c0f33ecc30c3653a4ad96086123656b414e
2014-08-28Merge "Fix external/chromium build with strerror_r."Elliott Hughes
2014-08-28Fix external/chromium build with strerror_r.Elliott Hughes
We're about to add GNU strerror_r to bionic in addition to the POSIX one we've always had. Bug: 16243479 Change-Id: I7ca907ed2b879feab4be8ba0180f83fc22fe86c6
2014-08-12Merge "Move external/chromium off external/icu4c."Elliott Hughes
2014-08-12Move external/chromium off external/icu4c.Elliott Hughes
Bug: 16893416 Change-Id: I561888c2fc6a5599f239ee0ec41e4debc185e7ff
2014-07-31Merge "Remove android_atomic_cas64 use."Hans Boehm
2014-07-31Remove android_atomic_cas64 use.Hans Boehm
Prepare to remove 64 bit android_atomics. Change-Id: I242500963edbe94411d69ec3ad36d2ac5843c35c
2014-03-20Merge "Fix x86-64 target build."idea133-weekly-releaseIan Rogers
2014-03-19Fix x86-64 target build.Ian Rogers
Change-Id: I57e4fd37babdb04033582e9676f2c16b7d213d85
2014-03-13Merge "Fix multilib build."Ying Wang
2014-03-13Fix multilib build.Ying Wang
Change-Id: I403b832319585b04edf69a27474dcdd23982b93b
2014-03-01Merge "Fix multi-arch build for x86"Selim Gurun
2014-02-27Fix multi-arch build for x86Qiming Shi
atomicops_internals_x86_gcc.cc should be also added to source file when x86 is built as the 2nd arch Change-Id: If1092f488fc8fdac350ed30083433b324dffe46d Signed-off-by: Qiming Shi <qiming.shi@intel.com>
2014-02-25Merge "Revert "Fix multi-arch build for x86""Kristian Monsen
2014-02-25Revert "Fix multi-arch build for x86"Kristian Monsen
This reverts commit 08b004c9938a06bea32288a4b4e40127887ff682. Change-Id: Ie12a9965554d5cd1d2c2f89d18c7952e155cff98
2014-02-25Merge "Fix multi-arch build for x86"Kristian Monsen
2014-02-25Fix multi-arch build for x86Qiming Shi
atomicops_internals_x86_gcc.cc should be also added to source file when x86 is built as the 2nd arch Change-Id: Iad9f6728edb9a1036a0bd52ea1307c7fec20022f Signed-off-by: Qiming Shi <qiming.shi@intel.com>
2014-02-21Merge "AArch64: Add support for arm64"Selim Gurun
2014-02-21AArch64: Add support for arm64Kévin PETIT
Change-Id: I38d24415a21179093e31d7c711e1d0e7274adc24 Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
2014-01-28Merge "external/chromium: convert LOCAL_MODULE_PATH to ↵android-4.4w_r1kitkat-wearColin Cross
LOCAL_MODULE_RELATIVE_PATH"
2014-01-24external/chromium: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATHColin Cross
LOCAL_MODULE_PATH doesn't work for multiarch builds, replace it with LOCAL_MODULE_RELATIVE_PATH. Change-Id: I4e4ceec61d026bbe74ba604554c06104bde42e5e
2013-12-07Merge "Hide warnings"idea133Kristian Monsen
2013-12-06Hide warningsKristian Monsen
Change-Id: I7e950eb4c683bb73712d6321a6ad5938ed247a7d
2013-06-14chromium: remove whole static libraries from libchromium_netandroid-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devColin Cross
LOCAL_WHOLE_STATIC_LIBRARIES is almost never what you want, it is generally used when you want a shared library to export the symbols from a static library to the users of the shared library. In this case it appears unnecessary, because there are no unresolved symbols when LOCAL_WHOLE_STATIC_LIBRARIES is replaced with LOCAL_STATIC_LIBRARIES. In addition, libcutils was listed in LOCAL_WHOLE_STATIC_LIBRARIES as well as LOCAL_SHARED_LIBRARIES. There is no need to link statically against libcutils, so remove it from LOCAL_STATIC_LIBRARIES. Change-Id: I983e74861bab7a5390bd2fa5b7c9b6e59c634152
2013-04-09Add liblogandroid-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1tools_r22.2jb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devYing Wang
Bug: 8580410 Change-Id: If8daea58455035a90b86bfad1fc613abd625e5ac
2013-03-14Fix for bug 8192440, enabled parsing of ICY headersKristian Monsen
Let the http stack also parse ICY status headers. Change-Id: I2ab636bbb54bfc91a40168efcfc7025cb03bbb2e
2013-01-02am 1f6155c0: Merge "bionic now defines _POSIX_MONOTONIC_CLOCK."Elliott Hughes
* commit '1f6155c0f4dede63c2163eee14c4e53c92ef3e60': bionic now defines _POSIX_MONOTONIC_CLOCK.
2013-01-02Merge "bionic now defines _POSIX_MONOTONIC_CLOCK."tools_r22jb-mr1.1-dev-plus-aospjb-mr1-dev-plus-aospElliott Hughes
2013-01-02bionic now defines _POSIX_MONOTONIC_CLOCK.Elliott Hughes
Change-Id: I0ccc29aa3701d74d6957892665c16a8f40cb2c42
2012-10-16Remove base/file_util_android.ccNick Kralevich
file_util_android.cc duplicates a bunch of definitions from libc. This causes the following (soon to be fatal) warning: /usr/local/google/code/android/master2/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.6/bin/../lib/gcc/arm-linux-androideabi/4.6.x-google/../../../../arm-linux-androideabi/bin/ld: warning: hidden symbol 'mkstemp' in out/target/product/maguro/obj/SHARED_LIBRARIES/libchromium_net_intermediates/base/file_util_android.o is referenced by DSO out/target/product/maguro/obj/lib/libcutils.so /usr/local/google/code/android/master2/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.6/bin/../lib/gcc/arm-linux-androideabi/4.6.x-google/../../../../arm-linux-androideabi/bin/ld: error: treating warnings as errors collect2: ld returned 1 exit status make: *** [out/target/product/maguro/obj/SHARED_LIBRARIES/libchromium_net_intermediates/LINKED/libchromium_net.so] Error 1 Since libc already defines these mk*temp*() methods, there's no need for chromium to redefine it. Change-Id: Ib028ecc1f3978c5c399b22bacdd6d6120105bca8
2012-09-05am 5dfd2805: Merge "Null pointer check missing in chromium"android-sdk-support_r11android-cts-4.2_r2android-cts-4.2_r1android-4.2_r1android-4.2_pre3android-4.2_pre2.2android-4.2_pre2.1android-4.2_pre2android-4.2_pre1.1android-4.2_pre1android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1jb-mr1.1-releasejb-mr1.1-devjb-mr1-releasejb-mr1-factory-releasejb-mr1-devJean-Baptiste Queru
* commit '5dfd28055043f52c8089d2b26e101de1f66838c8': Null pointer check missing in chromium
2012-09-05Merge "Null pointer check missing in chromium"tools_r21Jean-Baptiste Queru
2012-09-05Null pointer check missing in chromiumMagnus Hallqvist
When clearing a struct a null pointer check is missing in one location in chromium. The null check is present in another similar use cases. When the backend cache is reset a member of the struct data_ is set to zero before data_ itself is set to null. If the backend cache previously has been reset data_ will already be null and the member cannot be accessed (or uses undefined memory). The added null check will prevent the clearing of the member variable when data_ is already null. Change-Id: I475fea7436c871c2e82b841a93874e13a05161f4
2012-08-30Disable compression.Selim Gurun
Bug: 7079965 Change-Id: I6d5ac7d90fc2298b5e8a92cfae1ffb840016b88b
2012-08-15am f4aee7bd: Merge "back port upstream patch"Jean-Baptiste Queru
* commit 'f4aee7bd601621d648044a0f918247fd81b6190a': back port upstream patch
2012-08-15Merge "back port upstream patch"Jean-Baptiste Queru
2012-08-15back port upstream patchFengwei Yin
This patch is from Chromium project. It's used to handle potential issue in scoped_refptr. This is upstream patch porting and the original link is: http://codereview.chromium.org/9021020/ unittest change was not included. Change-Id: I14ce3df0653ff29713f38eceaf07e9b409cfaedc Author: Fengwei Yin <fengwei.yin@intel.com> Singed-off-by: Shuo Gao <shuo.gao@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 37500
2012-08-10am 1c684ed1: Merge "Fix lazy-instance template to preserve object alignment ↵Jean-Baptiste Queru
on MIPS." * commit '1c684ed1b5ac92ae473db5718627405367eb1766': Fix lazy-instance template to preserve object alignment on MIPS.
2012-08-10am 2af13d06: Merge "Add MIPS architecture support"Jean-Baptiste Queru
* commit '2af13d061b168f46912c78a76f20bc3956422ca5': Add MIPS architecture support
2012-08-10Merge "Fix lazy-instance template to preserve object alignment on MIPS."Jean-Baptiste Queru
2012-08-10Merge "Add MIPS architecture support"Jean-Baptiste Queru
2012-08-07Fix lazy-instance template to preserve object alignment on MIPS.Paul Lind
The alignment attribute of an object was discarded when allocating storage for the lazy-instance. Alignment is important for MIPS, where doubles (and objects containing them) must be aligned on 8-byte boundary. The alignment attributes are included via a macro that is only defined under GCC, so that this change does not affect other build enviromments. Change-Id: I99047cf610618de2e7e29e5de85835dc45d99231 Signed-off-by: Paul Lind <plind@mips.com>
2012-08-07Add MIPS architecture supportPaul Lind
Change-Id: Id2c3f41edee0e1c73cb084666533802bcf117876 Signed-off-by: Douglas Leung <douglas@mips.com> Signed-off-by: Chris Dearman <chris@mips.com>
2012-07-11am 0abec4da: Merge "Forward-compatible fix for ucontext_t"David 'Digit' Turner
* commit '0abec4daa38319f371ac6555e7887f6b14f34291': Forward-compatible fix for ucontext_t
2012-07-11Merge "Forward-compatible fix for ucontext_t"David 'Digit' Turner
2012-07-11Forward-compatible fix for ucontext_tDavid 'Digit' Turner
The Android C library <signal.h> will soon be modified to declare ucontext_t in <signal.h>. To avoid conflicts when this happens, only define the type when needed. See b/issue?id=2189142 Change-Id: I297b8e6f9fba8fb99c5f799b0d7e7f4dbda914bb
2012-06-11am 2f413d82: Reconcile with jb-releaseThe Android Open Source Project
* commit '2f413d82e2541002b7f9507ad66d341d130f80e1':
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 23:03:18 +0000