summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-03-18Merge "Add MODULE_LICENSE file"gradle_1.3.1gradle_1.3.0-beta4gradle_1.3.0-beta3gradle_1.3.0-beta2gradle_1.3.0-beta1gradle_1.2.3gradle_1.2.2gradle_1.2.1gradle_1.2.0-rc1gradle_1.2.0-beta1gradle_1.2.0android-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-wear-5.1.1_r1android-wear-5.1.0_r1android-tsl-4.0android-tsl-3.0android-tsl-2.0android-n-preview-5android-n-preview-4android-n-preview-3android-n-preview-2android-n-preview-1android-n-iot-preview-2android-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_r1studio-master-releasestudio-1.4-releasestudio-1.3-releasestudio-1.2-releasenougat-mr1-wear-releasen-iot-preview-2master-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-releaseemu-2.2-releaseemu-2.0-releaseemu-1.5-releaseemu-1.4-releaseandroid-support-testConley Owens
2015-03-12Add MODULE_LICENSE fileConley Owens
Change-Id: I02e16e43d9580e73dcf31ec483f95f46f6d89292
2014-06-26Merge "Add build.gradle file for SDK tools."studio_1.0.1studio_1.0.0studio_0.8.6gradle_1.1.3gradle_1.1.2gradle_1.1.1gradle_1.1.0-rc3gradle_1.1.0-rc2gradle_1.1.0-rc1gradle_1.1.0gradle_1.0.1gradle_1.0.0-rc4gradle_1.0.0-rc3gradle_1.0.0-rc2gradle_1.0.0-rc1gradle_1.0.0gradle_0.14.4gradle_0.14.3gradle_0.14.2gradle_0.14.1gradle_0.14.0gradle_0.13.3gradle_0.13.2gradle_0.13.1gradle_0.13.0gradle_0.12.2android-wear-5.0.0_r1android-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_r1adt_23.0.3ub-tools-idea133-releaseub-tools-idea133-milestonestudio-1.1-releasestudio-1.0-releaselollipop-wear-releaselollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releasel-previewidea133-milestoneXavier Ducrohet
2014-06-27Add build.gradle file for SDK tools.Xavier Ducrohet
Change-Id: I2508a59fef5877cb3134b197a4783f98220aef55
2012-08-23am 47e0cef8: am 77b9074f: Backport from master.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.2kitkat-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-devidea133-weekly-releaseidea133Tsu Chiang Chuang
* commit '47e0cef87666634660eef34273875ebd54654862': Backport from master.
2012-08-23am 77b9074f: Backport from master.android-sdk-support_r11android-cts-4.2_r2tools_r22jb-mr1.1-dev-plus-aospjb-mr1.1-devjb-mr1-dev-plus-aospjb-mr1-devTsu Chiang Chuang
* commit '77b9074f3d835682d66fe18e0768639745c34239': Backport from master.
2012-08-22resolved conflicts for merge of 05f1ab8c to masterYing Wang
Change-Id: I2190d297463260ea39d9d427fdac81e5933c1e50
2012-08-21Backport from master.android-cts-4.1_r4android-cts-4.1_r2android-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1tools_r21jb-mr0-releasejb-devTsu Chiang Chuang
Change-Id: I416e4325242ba147cb02acb69a577bf1fb60275f
2012-08-21Build emma as a static Java library.android-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-releaseYing Wang
Bug: 6987838 This is just a backport from master. Change-Id: I44b9bd97a5bf56b8eeaaecdcd4a0c0001af91a06
2012-08-06adding unbundled emma library.Tsu Chiang Chuang
Change-Id: Ieaa8d82b535cfc5a1f808255ac5f8eab034686a7
2010-03-08Add an empty CleanSpec.mkandroid-sdk-tools_r7android-sdk-tools_r6android-sdk-tools_r12android-sdk-adt_r20android-sdk-adt_r16.0.1android-sdk-adt_r12android-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-sdk-2.3.4_r1android-sdk-2.2_r2android-sdk-2.2_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.1_r1android-cts-4.0_r1android-cts-4.0.3_r2android-cts-4.0.3_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-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-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_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_r1android-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_r7tools_r20jb-releaseics-plus-aospics-mr1-releaseics-mr1ics-mr0-releaseics-mr0ics-factoryrom-2-releasegingerbread-releasegingerbread-mr4-releasegingerbreadfroyo-releasefroyo-plus-aospfroyoJean-Baptiste Queru
Change-Id: I3859e128f1ce3d98eeb8bac4400231c792eb38f1
2010-02-05am 48ffea93: am cf69b0c7: reconcile main tree with open-source eclairThe Android Open Source Project
Merge commit '48ffea93dff6b952b4ad5818b748dadd2dd7c19e' * commit '48ffea93dff6b952b4ad5818b748dadd2dd7c19e': android-2.1_r1 snapshot
2010-02-05am cf69b0c7: reconcile main tree with open-source eclairThe Android Open Source Project
Merge commit 'cf69b0c725088e68d9da916d909cf063562c5ee7' into eclair-plus-aosp * commit 'cf69b0c725088e68d9da916d909cf063562c5ee7': 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-02-02Merge "Add LCOV handling to Emma's ANT driver/jar"Horia Ciurdar
2010-01-29reconcile android-2.1_r1 snapshotThe Android Open Source Project
2010-01-20Change handling of the source file that Android's build can't pre-generate, ↵Tim Baverstock
so that Emma's native build system works normally. modified: ANDROID-CHANGES.txt modified: Android.mk new file: pregenerated/ANDROID-CHANGES.txt renamed: core/res/com/vladium/emma/rt/RTExitHook.closure -> pregenerated/res/com/vladium/emma/rt/RTExitHook.closure
2010-01-18Add LCOV handling to Emma's ANT driver/jarTim Baverstock
2010-01-12android-2.1_r1 snapshotThe Android Open Source Project
2009-12-01am 53666320: Add basic LCOV format support to EMMA\'s report generation. In ↵Tim Baverstock
K&R Java(!) Merge commit '536663200dc497eb27df655d205bfa32f057340b' into eclair-mr2-plus-aosp * commit '536663200dc497eb27df655d205bfa32f057340b': Add basic LCOV format support to EMMA's report generation. In K&R Java(!)
2009-11-27Add basic LCOV format support to EMMA's report generation. In K&R Java(!)Tim Baverstock
And add a simple regression test.
2009-11-15merge from open-source masterJean-Baptiste Queru
2009-11-15merge from open-source masterJean-Baptiste Queru
Merge commit 'goog/stage-korg-master' into HEAD
2009-11-15merge from eclairJean-Baptiste Queru
2009-11-12eclair snapshotJean-Baptiste Queru
2009-09-10am dd848041: Merge change 24481 into eclairPiotr Gurgul
Merge commit 'dd848041237b660bad38e6567cbfc0c0c5161c24' into eclair-plus-aosp * commit 'dd848041237b660bad38e6567cbfc0c0c5161c24': Convert emma license info file into text format
2009-09-10Merge change 24481 into eclairandroid-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-releaseAndroid (Google) Code Review
* changes: Convert emma license info file into text format
2009-09-09Convert emma license info file into text formatPiotr Gurgul
Content of cpl-v10.html converted into text file NOTICE.
2009-09-09am 43519313: Make a library version of the custom emma library.Xavier Ducrohet
Merge commit '435193132b0d5ab6c40bb85b04e11da43aeb1a4e' into eclair-plus-aosp * commit '435193132b0d5ab6c40bb85b04e11da43aeb1a4e': Make a library version of the custom emma library.
2009-09-09Make a library version of the custom emma library.Xavier Ducrohet
This library is to be packaged with the SDK so that test project can embedd it to add coverage support to their test. Change-Id: Ib424500c46c03b0854598fa16be8d0c7ae0b1ccb
2009-09-04merge from open-source masterJean-Baptiste Queru
2009-09-03merge from donutdonut-plus-aospJean-Baptiste Queru
2009-08-18am 9285a86b: Change emma to be optional build target.Brett Chabot
Merge commit '9285a86b311cdfe573e1326590ffd2ca90200b4b' into eclair * commit '9285a86b311cdfe573e1326590ffd2ca90200b4b': Change emma to be optional build target.
2009-08-18am 758de404: Remove emma from test build to save space.Brett Chabot
Merge commit '758de4045b2cb760c13e74758e7298a415964ee0' into eclair * commit '758de4045b2cb760c13e74758e7298a415964ee0': Remove emma from test build to save space.
2009-08-14Change emma to be optional build target.android-sdk-tools_r2android-sdk-1.6_r2android-sdk-1.6_r1android-sdk-1.6-docs_r1android-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_r1donut-release2donut-releasedonutBrett Chabot
2009-08-13Remove emma from test build to save space.Brett Chabot
BUG 2053298
2009-04-22Merge donut into masterJean-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-1.5_r3android-sdk-1.5_r1android-sdk-1.5-preandroid-1.5r4android-1.5r3android-1.5r2android-1.5cupcake-releasecupcakeThe Android Open Source Project
2009-03-03auto import from //depot/cupcake/@135843The Android Open Source Project
2009-01-15auto import from //branches/cupcake/...@126645The 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/emma 2.0.5312upstream/2.0.5312Upstream