aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'aosp/l-preview' into cm-11.0cm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNG3Cstable/cm-11.0-XNG2Sstable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0cm-11.0Brint E. Kriebel2014-09-29690-5689/+21708
|\
| * am 3fd19dba: (-s ours) Increase the java heap to 512M when running proguardstaging/cm-12.0-cafstaging/cm-12.0Tom Taylor2014-05-150-0/+0
| |\ | | | | | | | | | | | | * commit '3fd19dba2bdc0c4b64afda4d75836e1dcf7abf97': Increase the java heap to 512M when running proguard
| | * Increase the java heap to 512M when running proguardTom 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
* | Merge tag 'android-4.4_r1' into cm-11.0cm-11.0-XNPH44S-bacon-5fa8c79c0bcm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505acm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315eaRicardo Cerqueira2013-11-012-2/+5
|\| | | | | | | Android 4.4 Release 1.0
| * Update Retrace Default Regex to Latest VersionAlon Albert2013-06-132-2/+5
| | | | | | | | | | | | So it supports Android Bugreport Syntax Change-Id: I09713b53364a2e4cda44ee67325f183a54075433
* | Merge tag 'android-4.3_r2.1' into cm-10.2cm-10.2.1cm-10.2.0cm-10.2-M1stable/cm-10.2cm-10.2Ricardo Cerqueira2013-07-241-1/+1
|\| | | | | | | Android 4.3 release 2.1
| * increase the java heap to 512M when running proguard. Otherwise the Shem ↵Wei 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."cm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1-M2cm-10.1-M1mr1.1-stagingjellybean-stablejellybeancm-10.1Ying 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."ics-releaseicscm-9.1.0Raphael 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.mkcm-7.1.0gingerbread-releasegingerbreadgb-release-7.2Jean-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.4Joe Onorato2009-08-31703-0/+113006
|
* new project, first commitandroid-build SharedAccount2009-08-310-0/+0