summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-06-22Merge "Enable host multilib for ART testing."android-wear-5.1.1_r1android-wear-5.1.0_r1android-wear-5.0.0_r1android-m-preview-1android-m-previewandroid-l-preview_r2android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-wear-releaselollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releasel-previewIan Rogers
2014-06-17Enable host multilib for ART testing.Ian Rogers
Change-Id: I96947a1de222839548ccdc8cd441e5c78c146058
2014-02-05Merge "expat: don't link against libstdc++"idea133-weekly-releaseColin Cross
2014-02-04expat: don't link against libstdc++Colin Cross
arm64 NDK doesn't have libstdc++ yet, and libexpat doesn't need it. Override LOCAL_SYSTEM_SHARED_LIBRARIES to only link against libc. Change-Id: I51a5771000c7565b6c24ac6ed99e2af7fff9c889
2013-05-03am 6f4fce48: am 911ae80e: Merge "Add import_expat.sh"android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4w_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-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devidea133Brian Carlstrom
* commit '6f4fce48e02272da4bae2e8653f640a7d0f9397d': Add import_expat.sh
2013-05-03am 911ae80e: Merge "Add import_expat.sh"tools_r22.2Brian Carlstrom
* commit '911ae80eda0f316b5e6a3007b5efd3e95bed570a': Add import_expat.sh
2013-05-03Merge "Add import_expat.sh"tools_r22jb-mr1.1-dev-plus-aospBrian Carlstrom
2013-05-03Add import_expat.shBrian Carlstrom
Change-Id: Ie09ad2e17c5ced08923b0407fef54e6f0b08e4bf
2013-05-02Revert "Revert "Give unique name to host build shared libraries""Brian Carlstrom
This reverts commit 5cd891dc3368ffa7926e51137bc7a3ce051651c6 Change-Id: I4896915a959a4d5ab6e809105c1786aed791f269
2013-05-02Revert "Give unique name to host build shared libraries"Brian Carlstrom
This reverts commit cd0ca9490eef1b0fcea49db0542db7a800da3d50.
2013-05-02Merge "Give unique name to host build shared libraries" into ↵Brian Carlstrom
jb-mr2-dev-plus-aosp
2013-05-02Give unique name to host build shared librariesBrian Carlstrom
(cherry picked from commit cd0ca9490eef1b0fcea49db0542db7a800da3d50) Change-Id: I4be61fcad603952caae4dccced21f30cfddd6cd7
2013-05-02am d062392d: Merge "Give unique name to host build shared libraries"Brian Carlstrom
* commit 'd062392d484cf6ca7f4b3eb9032d8237f8eb63fd': Give unique name to host build shared libraries
2013-05-02Merge "Give unique name to host build shared libraries"Brian Carlstrom
2013-05-01Give unique name to host build shared librariesBrian Carlstrom
Change-Id: Ic8d28b44a6b12c98570715551873a3b843fbb64d
2012-11-13Use NDK for MIPS and x86 builds.android-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_r1jb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devArunesh Mishra
Bug: 6953633 Change-Id: I9866147a35b1d5a28afe2624d05a1543302af519
2012-09-10am bb9f3f74: am 7174719f: Merge "Upgrade to expat 2.1.0."Elliott Hughes
* commit 'bb9f3f74212ef523ff693cba9d782575ebba7418': Upgrade to expat 2.1.0.
2012-09-09am 7174719f: Merge "Upgrade to expat 2.1.0."android-sdk-support_r11android-cts-4.2_r2android-cts-4.2_r1android-4.2_r1android-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-dev-plus-aospjb-mr1-devElliott Hughes
* commit '7174719ff5f71e7fa1bc3af063905c92869c3b0e': Upgrade to expat 2.1.0.
2012-09-09Merge "Upgrade to expat 2.1.0."tools_r21Elliott Hughes
2012-09-09Upgrade to expat 2.1.0.Elliott Hughes
From http://www.libexpat.org/: Release 2.1.0 includes security & other bug fixes, new features, and updated build support. Security fixes * Memory leak in poolGrow (CVE-2012-1148) * Resource leak in readfilemap.c (CVE-2012-1147) * Hash DOS attack (CVE-2012-0876) * Buffer over-read and crash in big2_toUtf8 (CVE-2009-3560) * Parser crash with special UTF-8 sequences (CVE-2009-3270) New features * Added function XML_SetHashSalt that allows setting an initial value (salt) for hash calculations (part of the fix for bug 3496608). * When compiled with XML_ATTR_INFO defined, adds new API member XML_GetAttributeInfo() that allows retrieving the byte offsets for attribute names and values (patch 3446384). * Added CMake build system (bug 2990652, patch 3312568). * Added run-benchmark target to Makefile.in - relies on testdata module present in the same relative location as in the repository. Bug fixes * Harmful XML_ParserCreateNS suggestion (1742315) * CVE-2012-1147 - Resource leak in readfilemap.c (2895533) * Expat build fails on linux-amd64 with gcc version>=4.1 -O3 (1785430) * Build modifications using autoreconf instead of buildconf.sh (1983953, 2517952, 2517962, 2649838) * OBJEXT and EXEEXT support while building (2815947, 2884086) * CVE-2009-3720 - Parser crash with special UTF-8 sequences (1990430) * xmlwf should return non-zero exit status if not well-formed (2517938) * Wrong statement about XMLDecl in xmlwf.1 and xmlwf.sgml (2517946) * Dangling positionPtr after error (2855609) * CVE-2009-3560 - Buffer over-read and crash in big2_toUtf8() (2894085) * CVE-2012-1148 - Memory leak in poolGrow (2958794) * UNEXPECTED_STATE with a trailing "%" in entity value (3010819) * Unitialized memory returned from XML_Parse (3206497) * make check fails on mingw-w64 (87849) Change-Id: Ieb663fdfea82119918e245a714af533b58e0f7f5
2012-08-14am 4b529ee1: Retire LOCAL_NDK_VERSION.Ying Wang
* commit '4b529ee161c0cb544c45bf54cb8c731c4403aab8': Retire LOCAL_NDK_VERSION.
2012-08-14Retire LOCAL_NDK_VERSION.Ying Wang
Bug: 6932421 Change-Id: I77f71dc7bdfc8ab539be95ee23d9e24c0a298711
2012-08-14Retire LOCAL_NDK_VERSION.Ying Wang
Bug: 6932421 Change-Id: I77f71dc7bdfc8ab539be95ee23d9e24c0a298711
2012-07-31No-op - skip bad commitThe Android Open Source Project
Change-Id: I6c3089b11a24c1a49644947440517b741822e1aa
2012-07-30Initial empty repositoryChad Jones
2012-05-15Remove obsolete ThirdPartyProject.prop file.Elliott Hughes
Change-Id: I6bded5c4c45d70cf31356657f80942b7cc12cd2b
2012-05-07Remove dup header rules.android-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1android-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1android-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5android-4.1.1_r4android-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1jb-releasejb-mr0-releasejb-devYing Wang
This fixes the build warning: build/core/copy_headers.mk:15: warning: overriding commands for target `out/host/linux-x86/obj/include/libexpat/expat.h' build/core/copy_headers.mk:15: warning: ignoring old commands for target `out/host/linux-x86/obj/include/libexpat/expat.h' build/core/copy_headers.mk:15: warning: overriding commands for target `out/host/linux-x86/obj/include/libexpat/expat_external.h' build/core/copy_headers.mk:15: warning: ignoring old commands for target `out/host/linux-x86/obj/include/libexpat/expat_external.h' Change-Id: Ifa754483a4aa066f2d5f03e64b9a95e1643c0390
2012-05-03Make a libexpat.so for the host too.Elliott Hughes
(cherry picked from commit d05e49b92ad51d34f044f7bb47b91355833d1543) Change-Id: Ic5024521193faba36b740cc438f73f114f739745
2012-02-15Merge "[MIPS] Remove reference to NDK libs"android-sdk-adt_r20tools_r20ics-plus-aospJean-Baptiste Queru
2012-01-31[MIPS] Remove reference to NDK libsBhanu Chetlapalli
Change-Id: Ibfc0c1070c1224b34729318c82965e52e3596672 Signed-Off-By: Bhanu Chetlapalli <bhanu@mips.com>
2011-02-25Build static library for unbundled apps, and build with prebuilt NDK.android-sdk-adt_r16.0.1android-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.0_r1android-cts-4.0.3_r2android-cts-4.0.3_r1android-4.0.4_r2.1android-4.0.4_r2android-4.0.4_r1.2android-4.0.4_r1.1android-4.0.4_r1android-4.0.3_r1.1android-4.0.3_r1android-4.0.2_r1android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1ics-mr1-releaseics-mr1ics-mr0-releaseics-mr0ics-factoryrom-2-releaseMike Dodd
Change-Id: I0e9fc3d9cf1110360af210d3237473e0a829873d
2010-09-16Add optional tags to expat.android-sdk-tools_r12android-sdk-adt_r12android-sdk-2.3.4_r1android-cts-2.3_r5android-cts-2.3_r4android-cts-2.3_r3android-cts-2.3_r2android-cts-2.3_r12android-cts-2.3_r11android-cts-2.3_r10android-cts-2.3_r1android-2.3_r1android-2.3.7_r1android-2.3.6_r1android-2.3.6_r0.9android-2.3.5_r1android-2.3.4_r1android-2.3.4_r0.9android-2.3.3_r1aandroid-2.3.3_r1.1android-2.3.3_r1android-2.3.2_r1android-2.3.1_r1gingerbread-releasegingerbread-mr4-releasegingerbreadJesse Wilson
Change-Id: I356154b04a356a51a532a691d918c497c421586b
2010-07-16add meta-files about 3rd party projectsThe Android Open Source Project
Change-Id: I5ebe208d314129de68529d7c425e65b31b58da9c
2010-03-08Add an empty CleanSpec.mkandroid-sdk-tools_r7android-sdk-tools_r6android-sdk-2.2_r2android-sdk-2.2_r1android-cts-2.2_r8android-cts-2.2_r7android-cts-2.2_r6android-cts-2.2_r5android-cts-2.2_r4android-cts-2.2_r3android-cts-2.2_r2android-cts-2.2_r1android-adt-0.9.9android-adt-0.9.8android-2.2_r1.3android-2.2_r1.2android-2.2_r1.1android-2.2_r1android-2.2.3_r2.1android-2.2.3_r2android-2.2.3_r1android-2.2.2_r1android-2.2.1_r2android-2.2.1_r1tools_r9tools_r8tools_r7froyo-releasefroyo-plus-aospfroyoJean-Baptiste Queru
Change-Id: I4db0f89592a1f8ad0daec609fe261709c80b9edf
2010-02-05am 89c45519: reconcile main tree with open-source eclairThe Android Open Source Project
Merge commit '89c45519c99bd0b1633f307673d32dc4b40a3402' * commit '89c45519c99bd0b1633f307673d32dc4b40a3402': android-2.1_r1 snapshot
2010-02-05reconcile main tree with open-source eclairandroid-sdk-tools_r5android-cts-2.1_r5android-cts-2.1_r4android-cts-2.1_r3android-cts-2.1_r2eclairThe Android Open Source Project
2010-01-29reconcile android-2.1_r1 snapshotThe Android Open Source Project
2010-01-12android-2.1_r1 snapshotThe Android Open Source Project
2009-09-25Update expat to 2.0.1.Elliott Hughes
We had one local patch relative to 2.0.0, in "xmltok_impl.c". That fix isn't in 2.0.1, but an equivalent patch is in expat CVS. I've gone with the upstream change, and surrounded it with BEGIN/END android-changed comments. Bug: 2086506
2009-04-22Merge donut into masterandroid-sdk-tools_r4android-sdk-tools_r3android-sdk-2.1_r1android-sdk-2.0_r1android-sdk-2.0.1_r1android-sdk-2.0.1-docs_r1android-2.1_r2.1sandroid-2.1_r2.1p2android-2.1_r2.1pandroid-2.1_r2android-2.1_r1android-2.0_r1android-2.0.1_r1eclair-sholes-release2eclair-sholes-releaseeclair-releaseeclair-passion-releasedonut-plus-aospJean-Baptiste Queru
2009-03-29Merge branch 'open_source_no_contributions' into google_internalThe Android Open Source Project
2009-03-18Merge commit 'remotes/korg/cupcake' into cupcake_to_masterJean-Baptiste Queru
2009-03-03auto import from //depot/cupcake/@135843android-sdk-tools_r2android-sdk-1.6_r2android-sdk-1.6_r1android-sdk-1.6-docs_r1android-sdk-1.5_r3android-sdk-1.5_r1android-sdk-1.5-preandroid-1.6_r2android-1.6_r1.5android-1.6_r1.4android-1.6_r1.3android-1.6_r1.2android-1.6_r1.1android-1.6_r1android-1.5r4android-1.5r3android-1.5r2android-1.5donut-release2donut-releasedonutcupcake-releasecupcakeThe Android Open Source Project
2009-03-03auto import from //depot/cupcake/@135843The Android Open Source Project
2008-12-17Code drop from //branches/cupcake/...@124589The Android Open Source Project
2008-10-21Initial Contributionandroid-1.0release-1.0cdma-importThe Android Open Source Project
1970-01-12external/expat 2.0.0upstream/2.0.0Upstream