summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-03-31Merge "Remove -encoding UTF-8, it is now the default"android-wear-5.1.1_r1android-wear-5.1.0_r1android-m-preview-2android-m-preview-1android-m-previewandroid-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r41android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1master-soongmarshmallow-releasemarshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-releaseColin Cross
2015-03-30Remove -encoding UTF-8, it is now the defaultColin Cross
Change-Id: I573eacc97cdcdee289b15304a474e970e524be22
2015-01-23Merge "Stop building apache-xml on Mac OS."Narayan Kamath
2015-01-23Stop building apache-xml on Mac OS.Narayan Kamath
We don't build core-libart-hostdex for mac os any longer. Change-Id: I99f9a2d6cb2abfa94d26316abda54ba3ab80a231
2014-10-28am b6f1a009: Merge "Adjustment to patch for secure processing for ↵android-wear-5.0.0_r1lollipop-wear-releaseNarayan Kamath
CVE-2014-0107 by Ryan Berg based on feedack from Emmanuel Bourg." * commit 'b6f1a009193f13433cc8b00f27b84733845f3a4d': Adjustment to patch for secure processing for CVE-2014-0107 by Ryan Berg based on feedack from Emmanuel Bourg.
2014-10-28am 03cfec98: Merge "Commit patch to handle secure processing. Thank you Ryan ↵Narayan Kamath
Berg." * commit '03cfec986fd7c17789b9153076f7dcc98d9d9d3b': Commit patch to handle secure processing. Thank you Ryan Berg.
2014-10-24Merge "Adjustment to patch for secure processing for CVE-2014-0107 by Ryan ↵Narayan Kamath
Berg based on feedack from Emmanuel Bourg."
2014-10-24Merge "Commit patch to handle secure processing. Thank you Ryan Berg."Narayan Kamath
2014-10-19Adjustment to patch for secure processing for CVE-2014-0107 by Ryan Berg ↵Gary D. Gregory
based on feedack from Emmanuel Bourg. git-svn-id: https://svn.apache.org/repos/asf/xalan/java/branches/xalan-j_2_7_1_maint@1581426 13f79535-47bb-0310-9956-ffa450edef68
2014-10-19Commit patch to handle secure processing. Thank you Ryan Berg.Gary D. Gregory
git-svn-id: https://svn.apache.org/repos/asf/xalan/java/branches/xalan-j_2_7_1_maint@1581058 13f79535-47bb-0310-9956-ffa450edef68
2014-06-19am 00ee83ff: Merge "Switch from core to core-libart"android-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-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releaseBrian Carlstrom
* commit '00ee83ff1bd827a852065986ed0da7a3ded57a55': Switch from core to core-libart
2014-06-18Merge "Switch from core to core-libart"android-l-preview_r2l-previewBrian Carlstrom
2014-06-18Switch from core to core-libartBrian Carlstrom
Bug: 14298175 Change-Id: I76f9eedb4c37d1f5b9c15829a308652c5166d8b0
2014-06-13am a0af71c0: Merge "Remove deprecated WITH_HOST_DALVIK."Ian Rogers
* commit 'a0af71c0b361025bdcea7792a6bc76e57e51653c': Remove deprecated WITH_HOST_DALVIK.
2014-06-12Merge "Remove deprecated WITH_HOST_DALVIK."Ian Rogers
2014-06-11Remove deprecated WITH_HOST_DALVIK.Ian Rogers
Bug: 13751317 Change-Id: Ie756146e0b67c7417eeb0c3c7b9ff0314376963d
2013-11-25am 490db688: Merge "Remove use of LOCAL_BUILD_HOST_DEX."Narayan Kamath
* commit '490db688eaa8e162a4dd59f9aa491bf4520c46db': Remove use of LOCAL_BUILD_HOST_DEX.
2013-11-25Merge "Remove use of LOCAL_BUILD_HOST_DEX."idea133-weekly-releaseidea133Narayan Kamath
2013-11-25Remove use of LOCAL_BUILD_HOST_DEX.Narayan Kamath
Use BUILD_HOST_DALVIK_JAVA_LIBRARY instead. (cherry picked from commit 2825e4971f37b082bcd487e0da53f97855582e97) Change-Id: I767c1ee2da9513c11b76eb0ccacf6b94de6328ee
2013-10-28Remove use of LOCAL_BUILD_HOST_DEX.Narayan Kamath
Use BUILD_HOST_DALVIK_JAVA_LIBRARY instead. Change-Id: Ia832585ee22b9810edee35a86196a6b0ff91ca2d
2012-12-04Merge "Simplify makefile."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_r1android-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.2tools_r22kitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devjb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devjb-mr1.1-dev-plus-aospjb-mr1-dev-plus-aospElliott Hughes
2012-12-04Simplify makefile.Elliott Hughes
Change-Id: I7c9c3cd77be6a2f334d52474d6554057ba36e716
2012-05-15Remove obsolete ThirdPartyProject.prop file.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-devElliott Hughes
Change-Id: I275f364198ed5ac781e821e69d4dcb56504dc4aa
2011-05-20Reconcile with honeycomb-releaseandroid-sdk-adt_r20android-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.1_r4android-cts-4.1_r2android-cts-4.1_r1android-cts-4.0_r1android-cts-4.0.3_r2android-cts-4.0.3_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_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_r1tools_r21tools_r20jb-releasejb-mr0-releasejb-devics-plus-aospics-mr1-releaseics-mr1ics-mr0-releaseics-mr0ics-factoryrom-2-releaseThe Android Open Source Project
Change-Id: I2716b91f5b133ffd4b908227315129a5041fb3c6
2011-04-01Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-masterBrian Carlstrom
2011-01-31am 9fb03df8: Remove dependency to libcore.Anatol Pomazau
* commit '9fb03df8f04136e01e1c54ce55b5f14f19e6af98': Remove dependency to libcore.
2011-01-31Remove dependency to libcore.Anatol Pomazau
Having less dependencies between heavy libraries makes the build process faster. Change-Id: I93d3cbd02510f52aa7d8c0f5c0bf1fc85b381d9a
2011-01-20am c5cd1f43: Include XML resource properties files in the jar.Jesse Wilson
* commit 'c5cd1f43011fff85944b0558aaf1718f0eb9ab11': Include XML resource properties files in the jar.
2011-01-20Include XML resource properties files in the jar.Jesse Wilson
The lack of these files was breaking several DOM tests in our continuous build! Change-Id: I3f31bc2b173af7b138838b8d5859d4b496302a97
2011-01-16am 0be4d7ce: Move apache-xml to external. (project 1 of 4)Jesse Wilson
* commit '0be4d7ce48d3851f2e4110f8f0b0d3129f5327fb': Move apache-xml to external. (project 1 of 4)
2011-01-14Move apache-xml to external. (project 1 of 4) (dalvik-dev)Jesse Wilson
Change-Id: If39b2392a501d3d9c7862e69301c2a36d7628ff5 http://b/3351604
2011-01-14Move apache-xml to external. (project 1 of 4)Jesse Wilson
Change-Id: I4dd96e48227a12980b641ec786f689935e6739f2 http://b/3351604
2011-01-13merge in honeycomb-release history after reset to honeycombThe Android Automerger
2011-01-12am 3dad2dc5: am f74c8a0e: resolved conflicts for merge of 4f7abf2a to ↵repo sync
honeycomb-plus-aosp * commit '3dad2dc5dc3b134eb05e61f66754f4d796d07a79': Fix Double.toString.
2011-01-12am f74c8a0e: resolved conflicts for merge of 4f7abf2a to honeycomb-plus-aosprepo sync
* commit 'f74c8a0e66b6869d3b3bb4a30bf2f089e350980e': Fix Double.toString.
2011-01-12resolved conflicts for merge of 4f7abf2a to honeycomb-plus-aosprepo sync
Change-Id: Ieaf43d93b158ab143601b874c872570c3c3fe98b
2011-01-12am 3c61f6c5: am fb641fa5: am c4379294: Remove @cts comments from hidden classes.Carl Shapiro
* commit '3c61f6c5fa99f7558f2b0386b0365b9430ed41fd': Remove @cts comments from hidden classes.
2011-01-12am fb641fa5: am c4379294: Remove @cts comments from hidden classes.Carl Shapiro
* commit 'fb641fa5146f95c7571c939616bdc11384319dc0': Remove @cts comments from hidden classes.
2011-01-12am c4379294: Remove @cts comments from hidden classes.Carl Shapiro
* commit 'c43792941691fd119cf9df8e5c2c1419f3f7b92d': Remove @cts comments from hidden classes.
2011-01-12Remove @cts comments from hidden classes.Carl Shapiro
Change-Id: I948fc13d0fc236b07dad5864cab2e5c4eba2c06c
2011-01-12am 5dd36eac: am e91e39db: am dcd012af: Merge "Improve java.util.Locale ↵Elliott Hughes
documentation." into honeycomb * commit '5dd36eacfe6d35174cbbaf3da4296c73fc2a776f': Improve java.util.Locale documentation.
2011-01-12am e91e39db: am dcd012af: Merge "Improve java.util.Locale documentation." ↵Elliott Hughes
into honeycomb * commit 'e91e39dbeed2cfd9dfec1ebf7caf11d90856669a': Improve java.util.Locale documentation.
2011-01-12am dcd012af: Merge "Improve java.util.Locale documentation." into honeycombElliott Hughes
* commit 'dcd012af04d58a1dc5cb5e9d23f424035617ab58': Improve java.util.Locale documentation.
2011-01-12Merge "Improve java.util.Locale documentation." into honeycombElliott Hughes
2011-01-12am bc307281: am 2ce1fb3e: am 55fa6d07: Merge "Remove the allocation limits ↵Carl Shapiro
interfaces." into honeycomb * commit 'bc307281679f1b9b6d223fd962c37a8160510125': Remove the allocation limits interfaces.
2011-01-12am 2ce1fb3e: am 55fa6d07: Merge "Remove the allocation limits interfaces." ↵Carl Shapiro
into honeycomb * commit '2ce1fb3e40dbb939280dd8058b084b5b7246cb7d': Remove the allocation limits interfaces.
2011-01-12am 55fa6d07: Merge "Remove the allocation limits interfaces." into honeycombCarl Shapiro
* commit '55fa6d07410842bb0510b261eceb35da227ecd3e': Remove the allocation limits interfaces.
2011-01-12Merge "Remove the allocation limits interfaces." into honeycombCarl Shapiro
2011-01-12Remove the allocation limits interfaces.Carl Shapiro
Change-Id: I85c3b48cb11823cfccd1901cac685d0c457a74b3
2011-01-12am 8b652b16: am 600f780e: am a8b58362: Merge "Fix bugs in toString() in ↵Jesse Wilson
reflection classes." into honeycomb * commit '8b652b16465e8d3e9afa681d2999febfe10a84b6': Fix bugs in toString() in reflection classes.