summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am baa6a15c: Merge "Add MODULE_LICENSE file"replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2android-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_r1Conley Owens2015-03-051-0/+0
|\ | | | | | | | | * commit 'baa6a15c85c8ab803b580f3fcbd1eecfbbe9c3a7': Add MODULE_LICENSE file
| * Merge "Add MODULE_LICENSE file"Conley Owens2015-03-051-0/+0
| |\
| | * Add MODULE_LICENSE fileConley Owens2015-03-031-0/+0
| |/ | | | | | | Change-Id: Ia519f00065573092f0ef3e8ab8ce88258bd1ae86
* | am 6af8f100: Merge "Upgrade Proguard to 5.1."Brian Carlstrom2015-01-090-0/+0
|\| | | | | | | | | * commit '6af8f1004e0efe02a138286a34e833d1f3d227d7': Upgrade Proguard to 5.1.
| * Merge "Upgrade Proguard to 5.1."Brian Carlstrom2015-01-09738-4514/+16700
| |\
| | * Upgrade Proguard to 5.1.Brian Carlstrom2015-01-08738-4514/+16700
| |/ | | | | | | | | | | | | | | | | | | | | Downloaded from: http://sourceforge.net/projects/proguard/files/proguard/5.1/ Bug: 17550647 (cherry picked from commit 2270795fbe0b277bfd49f40950ecaa78583175cc) Change-Id: I4d4c6b4f11aca8d5595b7f285c675bc5873d5e24
* / Upgrade Proguard to 5.1.Brian Carlstrom2015-01-08738-4514/+16700
|/ | | | | | | | Downloaded from: http://sourceforge.net/projects/proguard/files/proguard/5.1/ Bug: 17550647 Change-Id: I2b4eab16eb7821fc232b294ab7f433aae08f71e1
* am 3fd19dba: (-s ours) Increase the java heap to 512M when running proguardwebview-m40_r4webview-m40_r3webview-m40_r2webview-m40_r1android-wear-5.1.1_r1android-wear-5.1.0_r1android-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_r1Tom Taylor2014-05-150-0/+0
|\ | | | | | | | | * commit '3fd19dba2bdc0c4b64afda4d75836e1dcf7abf97': Increase the java heap to 512M when running proguard
| * Increase the java heap to 512M when running proguardandroid-4.4w_r1Tom Taylor2014-05-151-1/+1
| | | | | | | | | | | | | | All of us building on Macs are running out of java heapspace during the proguard phase of the build. This CL fixes the problem. Change-Id: I461bb14b2ff2491e43ef8e2312e76a2a8fc0ee24
* | resolved conflicts for merge of b005651c to masterNarayan Kamath2013-11-270-0/+0
|\| | | | | | | Change-Id: I727039a1eb945a438432d5bab078379a27854c8f
| * Merge "Upgrade Proguard to 4.10."Narayan Kamath2013-11-26690-5689/+21708
| |\
| | * Upgrade Proguard to 4.10.Ying Wang2013-11-26690-5689/+21708
| |/ | | | | | | | | | | | | | | | | | | | | Downloaded from: http://sourceforge.net/projects/proguard/files/proguard/4.10/ Bug: 8992787 (cherry picked from commit b9cc48a43ed984587c939d02fba5316bf5c0df6e) Change-Id: I6c619bc8b0493530470e134127a04c7143aeee2d
* | Increase the java heap to 512M when running proguard. Otherwise it runs out ↵Mike Dodd2013-09-221-1/+1
| | | | | | | | | | | | | | | | of memory on some apps. (Resurrecting 3082b4a5fc45bc123067c9a984f90b7706704c59 which was lost in b9cc48a43ed984587c939d02fba5316bf5c0df6e) Change-Id: I0868e7fbb944aa48a4ef29880fb0cc5faa51c2e7
* | Upgrade Proguard to 4.10.Ying Wang2013-09-20690-5689/+21708
|/ | | | | | | | Downloaded from: http://sourceforge.net/projects/proguard/files/proguard/4.10/ Bug: 8992787 Change-Id: Ia07cc5b3feed443982b7e8f2a1f361479e735b18
* Update Retrace Default Regex to Latest Versionandroid-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_r1Alon Albert2013-06-132-2/+5
| | | | | | So it supports Android Bugreport Syntax Change-Id: I09713b53364a2e4cda44ee67325f183a54075433
* increase the java heap to 512M when running proguard. Otherwise the Shem ↵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_r1Wei Huang2012-09-041-1/+1
| | | | | | | | build runs out of memory building the Utopia jar file. Change-Id: Id3491f1f8f1640aa532c5ec30353d26a8d7ff8ac
* Revert "Upgrade from Progaurd 4.4 to 4.7."android-sdk-support_r11android-cts-4.2_r2android-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1Ying Wang2012-02-27651-12435/+4127
| | | | | This reverts commit cfead78069f3dc32998dc118ee08cab3867acea2. Bug: 6079915
* Upgrade from Progaurd 4.4 to 4.7.Ying Wang2012-02-27651-4127/+12435
| | | | | | | Change-Id: Ie185d0be411a80cc6a330cafa8547252a7dc1d9c You can find the changelog here http://proguard.sourceforge.net/#downloads.html
* am d889ce6d: Merge "Fix proguard wrappers."android-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.2_r1android-cts-4.0_r1android-cts-4.0.3_r2android-cts-4.0.3_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_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_r1Raphael Moll2011-05-172-2/+2
|\ | | | | | | | | * commit 'd889ce6df1a831f4cff915b4c2a48090ece14b03': Fix proguard wrappers.
| * Merge "Fix proguard wrappers."Raphael Moll2011-05-172-2/+2
| |\
| | * Fix proguard wrappers.Raphael Moll2011-05-092-2/+2
| |/ | | | | | | | | | | | | | | | | | | Shell version: This fixes the simple case of the proguard binary path having a space in it. Bat version: Use %* to capture all arguments, not just the first 9 ones. It's typical to have > 10. Change-Id: I32e7bcbe0c78f7518a1d727e4d80c07ec6d673b5
* / Add missing NOTICE files.David Deephanphongs2010-10-191-0/+367
|/ | | | Change-Id: I7ebb33bf0dcbde7186dc96020f5871dc14fad5d7
* Add an empty CleanSpec.mkandroid-cts-2.3_r12android-cts-2.3_r11android-cts-2.3_r10android-cts-2.2_r8android-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_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_r1Jean-Baptiste Queru2010-03-081-0/+49
| | | | Change-Id: I5e7a3a7161faf357d09d34b3dba61c52be7ace07
* am 198fe95b: reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
|\ | | | | | | | | | | | | Merge commit '198fe95bdbe59b9d2048c9ccb015132bfed578b2' into eclair-plus-aosp * commit '198fe95bdbe59b9d2048c9ccb015132bfed578b2': android-2.1_r1 snapshot
| * reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
| |\
| | * reconcile android-2.1_r1 snapshotThe Android Open Source Project2010-01-290-0/+0
| |/|
| | * android-2.1_r1 snapshotThe Android Open Source Project2010-01-12703-0/+113006
| | |
* | | merge from open-source masterThe Android Open Source Project2010-01-210-0/+0
|\ \ \ | |/ / |/| / | |/
| * empty initial commitThe Android Open Source Project2010-01-110-0/+0
|
* ProGuard 4.4android-2.1_r2.1sandroid-2.1_r2.1p2android-2.1_r2.1pandroid-2.1_r2android-2.1_r1android-2.0_r1android-2.0.1_r1Joe Onorato2009-08-31703-0/+113006
|
* new project, first commitandroid-build SharedAccount2009-08-310-0/+0