aboutsummaryrefslogtreecommitdiffstats
path: root/eclipse
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge "Update Eclipse plugins\' version from 23.0.2 -> 23.0.3" into idea133Siva Velusamy2014-07-2252-76/+76
|\ \ | |/ | | | | | | | | | | automerge: 234cc6a * commit '234cc6a9237ddd9ad29eaa04a9146051d9edf7f6': Update Eclipse plugins' version from 23.0.2 -> 23.0.3
| * Update Eclipse plugins' version from 23.0.2 -> 23.0.3Siva Velusamy2014-07-2152-76/+76
| | | | | | | | Change-Id: I25f248244c588c36eeb92b4abb802a2877f3407b
* | Merge "Don\'t compress apks." into idea133Xavier Ducrohet2014-07-211-0/+4
|\ \ | |/ | | | | | | | | | | automerge: b6d2791 * commit 'b6d2791f11ce841f4a57f28ce2f411ab3016dc09': Don't compress apks.
| * Merge "Don't compress apks." into idea133Xavier Ducrohet2014-07-201-0/+4
| |\
| | * Don't compress apks.Xavier Ducrohet2014-07-211-0/+4
| | | | | | | | | | | | Change-Id: I000bc2ef58c189b60148bd242d914b6cdae7df97
* | | Merge "Correct incorrect test for RenderScript support." into idea133Xavier Ducrohet2014-07-211-5/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | automerge: 5afdda0 * commit '5afdda0e90c1900d7f249985ddc09ed4a98ce053': Correct incorrect test for RenderScript support.
| * | Merge "Correct incorrect test for RenderScript support." into idea133Xavier Ducrohet2014-07-171-5/+5
| |\ \ | | |/ | |/|
| | * Correct incorrect test for RenderScript support.Jean-Luc Brouillet2014-07-181-5/+5
| | | | | | | | | | | | Change-Id: I332c2ca02644a44dd310bcd0ac1eff62a4b8fb14
* | | Merge "Add support for tools:menu" into idea133Deepanshu Gupta2014-07-213-3/+102
|\ \ \ | |/ / | | | | | | | | | | | | | | | automerge: f97852e * commit 'f97852ed287f6c8a26414ae163e5423f9af1d0b9': Add support for tools:menu
| * | Add support for tools:menuDeepanshu Gupta2014-07-173-3/+102
| | | | | | | | | | | | | | | | | | | | | Add support for menus in the Layout Editor through tools attributes like tools:menu and tools:actionBarNavMode. Change-Id: If437d5727579670e65a21efd4016bdc53fd172bf
* | | Merge "73313: NullPointerException Lint error on adt 23.0.2" into idea133Tor Norbye2014-07-211-1/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | automerge: 5366132 * commit '536613233c5007d1743eb1d0cee3795de0099518': 73313: NullPointerException Lint error on adt 23.0.2
| * | 73313: NullPointerException Lint error on adt 23.0.2Tor Norbye2014-07-141-1/+6
| |/ | | | | | | Change-Id: Iaf29f9afd0991b5886a00247f8a699a14ccd1b7a
* | Merge "emulator/opengl: Add global lock to libOpenglRender." into idea133David 'Digit' Turner2014-07-215-7/+7
|\ \ | |/ | | | | | | | | | | | | automerge: d1dd8ee * commit 'd1dd8ee1e85f60569ddf6ebc7fe1cbde7ebb6f38': emulator/opengl: Add global lock to libOpenglRender. Move SdkVersionInfo from sdk-common to sdklib, part 3.
| * Move SdkVersionInfo from sdk-common to sdklib, part 3.Raphael Moll2014-07-075-7/+7
| | | | | | | | | | | | | | Fix imports in ADT. Related to tools/base change Iea81ed343f41112eaa9dbb94a97f8f01930bbb0b. Change-Id: I87c57ceb175ef7cda09d44f014d587eb046ab90e
* | Merge "ADT: Fix NPE in InstrumentationRunnerValidator" into idea133Siva Velusamy2014-07-212-13/+21
|\ \ | |/ | | | | | | | | | | automerge: f02566d * commit 'f02566dd73b68732818a0cc3a19af5c9d29a3361': ADT: Fix NPE in InstrumentationRunnerValidator
| * Merge "ADT: Fix NPE in InstrumentationRunnerValidator" into idea133Siva Velusamy2014-07-022-13/+21
| |\
| | * ADT: Fix NPE in InstrumentationRunnerValidatorSiva Velusamy2014-07-012-13/+21
| | | | | | | | | | | | | | | | | | | | | This CL adds a few checks to guard against NPEs that could occur if the manifest parsing failed (e.g. due to a missing manifest) Change-Id: I82a9b3b1fa3d651c13125798f70b61e5492e0838
* | | Merge "Update Eclipse plugins\' version from 23.0.1 -> 23.0.2" into idea133Xavier Ducrohet2014-07-0152-76/+76
|\ \ \ | |/ / | | | | | | | | | | | | | | | automerge: 64fb16d * commit '64fb16de86e17977a26ba7d50f22cb9b9ecfcf0e': Update Eclipse plugins' version from 23.0.1 -> 23.0.2
| * | Update Eclipse plugins' version from 23.0.1 -> 23.0.2Siva Velusamy2014-07-0152-76/+76
| |/ | | | | | | Change-Id: Ieceeae72231107ea4d49aa9dcb4a4c33220f5ffd
* | Merge "Remove about.mappings from build.properties" into idea133Siva Velusamy2014-07-011-1/+0
|\ \ | |/ | | | | | | | | | | automerge: 9c3dd6e * commit '9c3dd6e81a130cc8879c8e0198a3c585044c7f5c': Remove about.mappings from build.properties
| * Remove about.mappings from build.propertiesSiva Velusamy2014-07-011-1/+0
| | | | | | | | | | | | The file about.mappings was removed in a previous commit. Change-Id: I9e90125084273d6511ee7c816a656c9e55b5814e
* | Merge "Set default product" into idea133Siva Velusamy2014-07-019-235/+52
|\ \ | |/ | | | | | | | | | | automerge: 964e8b7 * commit '964e8b728f2f239b5a01afc23d3bf7a8c0355511': Set default product
| * Merge "Set default product" into idea133Siva Velusamy2014-06-289-235/+52
| |\
| | * Set default productSiva Velusamy2014-06-309-235/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL fixes a bunch of issues in the packaging of the ADT product. Specifically: - the correct default product is now used giving us the correct initial Java perspective - the dependencies go one way (ADT package -> ADT), and this allows upgrading of ADT without upgrading the ADT package. Change-Id: I9a1b85e0bee8d073e27067e7450ce08a88609c3c
* | | Merge "Fix Template Inflation in ADT" into idea133Josiah Gaskin2014-06-306-9/+128
|\ \ \ | |/ / | | | | | | | | | | | | | | | automerge: 66c679f * commit '66c679f3506d72e9a5fc2e2310605e82782b483d': Fix Template Inflation in ADT
| * | Merge "Fix Template Inflation in ADT" into idea133Josiah Gaskin2014-06-276-9/+128
| |\ \ | | |/ | |/|
| | * Fix Template Inflation in ADTJosiah Gaskin2014-06-276-9/+128
| | | | | | | | | | | | | | | | | | | | | This change updates template handling in ADT to handle new tags including formfactor and category. Change-Id: Ia9bd6bdcfaf40061835381f8d3c6f8d67274d694
* | | Merge "Update plugin versions to 23.0.1" into idea133Siva Velusamy2014-06-2752-82/+82
|\ \ \ | |/ / | | | | | | | | | | | | | | | automerge: 13df34d * commit '13df34d6d2e2ba8e70f3e2e92858041ce1ae664d': Update plugin versions to 23.0.1
| * | Update plugin versions to 23.0.1Siva Velusamy2014-06-2752-82/+82
| | | | | | | | | | | | Change-Id: Icb5be47b688808488811411a5f45a23a49f774d2
* | | Merge "monitor: Update path to hprof-conv" into idea133Siva Velusamy2014-06-271-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | automerge: d187c91 * commit 'd187c91b92e0609696225fdae0aa905058596df8': monitor: Update path to hprof-conv
| * | monitor: Update path to hprof-convSiva Velusamy2014-06-271-1/+1
| |/ | | | | | | | | | | | | | | From tools r22.3, hprof-conv is inside platform-tools, not tools. I've filed https://code.google.com/p/android/issues/detail?id=72570 to make a better fix in the future. Change-Id: I21af21f9e2e6383c9d89be5d94c5474f42e32aec
* | Merge "Fix zipalign/hprof-conv issue in ADT." into idea133Xavier Ducrohet2014-06-214-25/+29
|\ \ | |/ | | | | | | | | | | automerge: 2206210 * commit '220621089bd6a7cfac2c3d1a0fa8aeeffc94391b': Fix zipalign/hprof-conv issue in ADT.
| * Merge "Fix zipalign/hprof-conv issue in ADT." into idea133Xavier Ducrohet2014-06-204-25/+29
| |\
| | * Fix zipalign/hprof-conv issue in ADT.Xavier Ducrohet2014-06-214-25/+29
| | | | | | | | | | | | | | | | | | | | | | | | These files are now in plat-tools. also make tools 23 depend on that new plat-tools and adt/tools 23 require each other. Change-Id: Icdcf3b9f7f0787d385a930f7ebecfcf7049eb3e0
* | | Merge "Remove ADT branding from p2 repo" into idea133Siva Velusamy2014-06-211-3/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | automerge: 7405c88 * commit '7405c88e0c8f5cab2c2ca397dec412e4f03176b1': Remove ADT branding from p2 repo
| * | Remove ADT branding from p2 repoSiva Velusamy2014-06-211-3/+0
| |/ | | | | | | Change-Id: I65a6ab62f3aa90e5c6b17c91ab720c7b1cb92539
* | Merge "Fix packagign of sdk launcher exe on win." into idea133Xavier Ducrohet2014-06-1953-85/+83
|\ \ | |/ | | | | | | | | | | | | | | | | | | 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
| * Add monitor to sdk buildSiva Velusamy2014-06-171-2/+0
| | | | | | | | Change-Id: I8ecbf06e6f52997be19d48a1c2063204c34096d6
| * Update ADT plugins/features version to 23.0.0Siva Velusamy2014-06-1752-83/+83
| | | | | | | | Change-Id: I354930bdc6304908e447b4eb8b66f6f09b0ffb4c
* | 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
| * 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
| * 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
| * 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-1755-96/+99
|\ \ | |/ | | | | | | | | | | | | | | 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.
| * 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