aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Enable large sd cards.Xavier Ducrohet2014-06-191-0/+4
| |/ | | | | | | Change-Id: I446336cd4f33bf1959a6bec8803223c8899ef416
* | Merge "fix AVD Manager name." into idea133Xavier Ducrohet2014-06-191-1/+1
|\ \ | |/ | | | | | | | | | | automerge: 306af44 * commit '306af449f1bbc5c584daaf2be28ab6baed57ed9c': fix AVD Manager name.
| * Merge "fix AVD Manager name." into idea133Xavier Ducrohet2014-06-181-1/+1
| |\
| | * fix AVD Manager name.Xavier Ducrohet2014-06-181-1/+1
| | | | | | | | | | | | Change-Id: I3062b447167a9d2d479a7205a5236176946d4e54
* | | Merge "Fix find_java." into idea133Xavier Ducrohet2014-06-192-0/+40
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | automerge: 1b20fb2 * commit '1b20fb2c482be9a6b782fdf13468dc96d731c205': Fix find_java. monitor: Remove unnecessary plugins during release
| * | Merge "Fix find_java." into idea133Xavier Ducrohet2014-06-171-0/+6
| |\ \
| | * | Fix find_java.Xavier Ducrohet2014-06-181-0/+6
| | |/ | | | | | | | | | Change-Id: Ib2395bd47f4a751b449a618563b438e72f76633f
| * | Merge "monitor: Remove unnecessary plugins during release" into idea133Siva Velusamy2014-06-181-0/+34
| |\ \ | | |/ | |/|
| | * monitor: Remove unnecessary plugins during releaseSiva Velusamy2014-06-181-0/+34
| | | | | | | | | | | | Change-Id: I9b0d699118fb6e4b9b4d5f6c50a44e57db1eadb3
* | | Merge "Fix packagign of sdk launcher exe on win." into idea133Xavier Ducrohet2014-06-1958-88/+170
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: e852499 * commit 'e85249977173a9d32f87502ba374b05be29629a7': Fix packagign of sdk launcher exe on win. Make zipAlignExe come from Build-tools Add monitor to sdk build Update ADT plugins/features version to 23.0.0 Update Tools package revision to 23.0.0
| * | Merge "Fix packagign of sdk launcher exe on win." into idea133Xavier Ducrohet2014-06-171-1/+1
| |\ \ | | |/ | |/|
| | * Fix packagign of sdk launcher exe on win.Xavier Ducrohet2014-06-181-1/+1
| |/ | | | | | | Change-Id: I67584b3aff3f956479488a9345e4407fd21c538c
| * Merge "Make zipAlignExe come from Build-tools" into idea133Xavier Ducrohet2014-06-172-1/+5
| |\
| | * Make zipAlignExe come from Build-toolsXavier Ducrohet2014-06-172-1/+5
| |/ | | | | | | | | | | Also package proguard-project.txt in sdk tools. Change-Id: I82f61cc60d62c1412bba97e107a59ccecc1d851d
| * Merge "Add monitor to sdk build" into idea133Siva Velusamy2014-06-172-2/+80
| |\
| | * Add monitor to sdk buildSiva Velusamy2014-06-172-2/+80
| | | | | | | | | | | | Change-Id: I8ecbf06e6f52997be19d48a1c2063204c34096d6
| * | Merge "Update ADT plugins/features version to 23.0.0" into idea133Xavier Ducrohet2014-06-1752-83/+83
| |\ \ | | |/
| | * Update ADT plugins/features version to 23.0.0Siva Velusamy2014-06-1752-83/+83
| | | | | | | | | | | | Change-Id: I354930bdc6304908e447b4eb8b66f6f09b0ffb4c
| * | Merge "Update Tools package revision to 23.0.0" into idea133Xavier Ducrohet2014-06-171-1/+1
| |\ \ | | |/
| | * Update Tools package revision to 23.0.0Siva Velusamy2014-06-171-1/+1
| |/ | | | | | | Change-Id: Ibde1263dc3cec1a1789fe3c02f87d01d37090a94
* | Merge "AVD/SDK Launchers win build." into idea133Xavier Ducrohet2014-06-196-2/+74
|\ \ | |/ | | | | | | | | | | automerge: c86e450 * commit 'c86e450e6ad3bdc6a8ba134e7c56ecb49e8a38ee': AVD/SDK Launchers win build.
| * Merge "AVD/SDK Launchers win build." into idea133Xavier Ducrohet2014-06-176-2/+74
| |\
| | * AVD/SDK Launchers win build.Xavier Ducrohet2014-06-176-2/+74
| |/ | | | | | | Change-Id: Iacff7f6bfe95a2a95b85cf00cd3e2dd34e5358b6
* | Merge "Compile find_java with Gradle." into idea133Xavier Ducrohet2014-06-176-0/+35
|\ \ | |/ | | | | | | | | | | automerge: ecf2fbf * commit 'ecf2fbf21b7babfcd746ea1c622573268719eb53': Compile find_java with Gradle.
| * Merge "Compile find_java with Gradle." into idea133Xavier Ducrohet2014-06-166-0/+35
| |\
| | * Compile find_java with Gradle.Xavier Ducrohet2014-06-116-0/+35
| | | | | | | | | | | | Change-Id: I90ff236c35a857ebde82c3d63479709474aad204
* | | Merge changes Ib3d44914,Id8cd09ed,Ib315de96 into idea133Siva Velusamy2014-06-177-114/+10
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | automerge: c278491 * commit 'c2784914e7a7ce574553e550a85f8998f7da70dd': monitor product: Increase default heap size Remove unneeded dependencies from traceview feature.xml Remove obsolete .product files
| * | Merge changes Ib3d44914,Id8cd09ed,Ib315de96 into idea133Siva Velusamy2014-06-127-114/+10
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * changes: monitor product: Increase default heap size Remove unneeded dependencies from traceview feature.xml Remove obsolete .product files
| | * | monitor product: Increase default heap sizeSiva Velusamy2014-06-152-2/+5
| | | | | | | | | | | | | | | | Change-Id: Ib3d4491457187365ed982adfb0ea4db52d02424c
| | * | Remove unneeded dependencies from traceview feature.xmlSiva Velusamy2014-06-153-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The traceview feature pulled in unnecessary dependencies (jdt) into the monitor product build. Change-Id: Id8cd09ed6c85602e3cc7635066adb8b8aedc55d0
| | * | Remove obsolete .product filesSiva Velusamy2014-06-153-107/+0
| |/ / | | | | | | | | | | | | | | | Tycho picks them up from artifacts/bundles folder. Change-Id: Ib315de964e69d7e70c5c651b00c0922c3e073c11
* | | Merge "Fix build script: no more .tar.gz files for adt bundles" into idea133Siva Velusamy2014-06-171-1/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | automerge: d48b96c * commit 'd48b96cccb8531f70bf3ce09ac0fdde16caf6681': Fix build script: no more .tar.gz files for adt bundles
| * | Merge "Fix build script: no more .tar.gz files for adt bundles" into idea133Siva Velusamy2014-06-121-1/+0
| |\ \
| | * | Fix build script: no more .tar.gz files for adt bundlesSiva Velusamy2014-06-131-1/+0
| | | | | | | | | | | | | | | | Change-Id: I12d32503f8757b72390e8017dd6d631428ce01c8
* | | | Merge "eclipse tycho: Bundle artifacts as zips on all platforms" into idea133Siva Velusamy2014-06-171-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | automerge: 6dc40bd * commit '6dc40bd7a84de77f0de67292de3e1a38a8ae14ac': eclipse tycho: Bundle artifacts as zips on all platforms
| * | | Merge "eclipse tycho: Bundle artifacts as zips on all platforms" into idea133Siva Velusamy2014-06-121-2/+2
| |\ \ \ | | |/ /
| | * | eclipse tycho: Bundle artifacts as zips on all platformsSiva Velusamy2014-06-131-2/+2
| |/ / | | | | | | | | | Change-Id: I84e54e58d61edf111aaa7c62ab0db38d3afe5974
* | | Merge changes I976cd490,I1833fcca into idea133Raphael Moll2014-06-1756-97/+100
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | automerge: 00b0604 * commit '00b0604e22925652b862354623ad99535b52d64e': Update ADT plugins/features version number. Adapt script to change ADT plugins/features number to p2repo. Update Tools package revision number.
| * | Merge changes I976cd490,I1833fcca into idea133Raphael Moll2014-06-1255-96/+99
| |\ \ | | | | | | | | | | | | | | | | | | | | * changes: Update ADT plugins/features version number. Adapt script to change ADT plugins/features number to p2repo.
| | * | Update ADT plugins/features version number.Raphael Moll2014-06-1354-92/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Similar to change I1913711556c17fe1799a963b52214f338768fffd this is only provisional till the final versio number gets decided. Change-Id: I976cd490a7dee07d4a6b0eaf98972bcd89620f80
| | * | Adapt script to change ADT plugins/features number to p2repo.Raphael Moll2014-06-131-4/+7
| | | | | | | | | | | | | | | | Change-Id: I1833fccaa56199326da420cca491662083a4d13b
| * | | Merge "Update Tools package revision number." into idea133Raphael Moll2014-06-121-1/+1
| |\ \ \ | | |/ /
| | * | Update Tools package revision number.Raphael Moll2014-06-131-1/+1
| |/ / | | | | | | | | | Change-Id: I1913711556c17fe1799a963b52214f338768fffd
* | | Merge "Use build number as context qualifier for Eclipse plugins" into idea133Siva Velusamy2014-06-132-2/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | automerge: 501f1fe * commit '501f1fe0e1973763e3bd5d60b04b9e46d4877b6a': Use build number as context qualifier for Eclipse plugins
| * | Merge "Use build number as context qualifier for Eclipse plugins" into idea133Siva Velusamy2014-06-122-2/+7
| |\ \
| | * | Use build number as context qualifier for Eclipse pluginsSiva Velusamy2014-06-122-2/+7
| |/ / | | | | | | | | | Change-Id: I22b5c0127c7534dadcb6f0c6f7543ba64592b420
* | | Merge "Fix filename for generated p2 repository" into idea133Siva Velusamy2014-06-121-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | automerge: 7267eaf * commit '7267eaf12dd48d391480481f1966a86fdba50534': Fix filename for generated p2 repository
| * | Merge "Fix filename for generated p2 repository" into idea133Siva Velusamy2014-06-111-1/+1
| |\ \
| | * | Fix filename for generated p2 repositorySiva Velusamy2014-06-121-1/+1
| |/ / | | | | | | | | | Change-Id: I0bc2ae9690707432fd83a46e9b6e6eb9009f97aa
* | | Merge "Cleanup ADT build scripts: remove makefile" into idea133Siva Velusamy2014-06-123-75/+88
|\ \ \ | |/ / | | | | | | | | | | | | | | | automerge: 61e54e2 * commit '61e54e2039bb2544e14bf9d09171d4efc2387c05': Cleanup ADT build scripts: remove makefile