aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * emulator/opengl: refactor shared library handling.David 'Digit' Turner2014-07-0917-174/+396
| |/ | | | | | | | | | | + Add a unit test. Change-Id: I27c993d1dc819e5bd89fc1e9ae266e11e6ef9a76
* | Merge "emulator/opengl: Add global lock to libOpenglRender." into idea133David 'Digit' Turner2014-07-219-21/+24
|\ \ | |/ | | | | | | | | | | | | automerge: d1dd8ee * commit 'd1dd8ee1e85f60569ddf6ebc7fe1cbde7ebb6f38': emulator/opengl: Add global lock to libOpenglRender. Move SdkVersionInfo from sdk-common to sdklib, part 3.
| * Merge "emulator/opengl: Add global lock to libOpenglRender." into idea133David 'Digit' Turner2014-07-024-14/+17
| |\
| | * emulator/opengl: Add global lock to libOpenglRender.David 'Digit' Turner2014-07-084-14/+17
| |/ | | | | | | | | | | | | | | | | | | | | This patch ensures that all render threads use the same global lock to synchronize calls to the underlying GLES/EGL libraries. Original patch from Thomas Knych (thomaswk@google.com) BUG=9627179 Change-Id: I8ac9a43bc30bba8a9a06f832cf29e72263d946ce
| * Merge "Move SdkVersionInfo from sdk-common to sdklib, part 3." into idea133Raphael Moll2014-07-065-7/+7
| |\
| | * 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 version to 23.0.2" into idea133Xavier Ducrohet2014-07-011-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | automerge: 2810b9a * commit '2810b9a463a6e51a05c7b6ebbcc4dc4cacc13608': Update version to 23.0.2
| * | Merge "Update version to 23.0.2" into idea133Xavier Ducrohet2014-07-011-1/+1
| |\ \
| | * | Update version to 23.0.2Xavier Ducrohet2014-07-011-1/+1
| | | | | | | | | | | | | | | | Change-Id: I70544d601f0d3ea0616811737067809c754e6c01
* | | | 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
| * | | Merge "Update Eclipse plugins' version from 23.0.1 -> 23.0.2" into idea133Xavier Ducrohet2014-07-0152-76/+76
| |\ \ \
| | * | | Update Eclipse plugins' version from 23.0.1 -> 23.0.2Siva Velusamy2014-07-0152-76/+76
| |/ / / | | | | | | | | | | | | Change-Id: Ieceeae72231107ea4d49aa9dcb4a4c33220f5ffd
* | | | Merge "Release proguard.bat in windows sdk" into idea133Xavier Ducrohet2014-07-011-13/+24
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | automerge: 89fede9 * commit '89fede9eb51b123e0db1d3b70739d0c571104053': Release proguard.bat in windows sdk
| * | | Merge "Release proguard.bat in windows sdk" into idea133Xavier Ducrohet2014-07-011-13/+24
| |\ \ \ | | | |/ | | |/|
| | * | Release proguard.bat in windows sdkSiva Velusamy2014-07-011-13/+24
| |/ / | | | | | | | | | | | | | | | Also release proguard-android.txt Change-Id: I7ca6aab59c8ac2f0313eca85dc3021015410dc96
* | | Merge "Remove about.mappings from build.properties" into idea133Siva Velusamy2014-07-011-1/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | automerge: 9c3dd6e * commit '9c3dd6e81a130cc8879c8e0198a3c585044c7f5c': Remove about.mappings from build.properties
| * | Merge "Remove about.mappings from build.properties" into idea133Siva Velusamy2014-06-301-1/+0
| |\ \
| | * | 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 version to 23.0.1" into idea133Xavier Ducrohet2014-06-271-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | automerge: 2ac5b9c * commit '2ac5b9c76d99fc457026cad8a636265f8947f84e': Update version to 23.0.1
| * | Merge "Update version to 23.0.1" into idea133Xavier Ducrohet2014-06-271-1/+1
| |\ \
| | * | Update version to 23.0.1Xavier Ducrohet2014-06-271-1/+1
| |/ / | | | | | | | | | Change-Id: I08ecb6c485b98147a51bc0f58156659b1822741b
* | | 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
| * | Merge "Update plugin versions to 23.0.1" into idea133Siva Velusamy2014-06-2652-82/+82
| |\ \
| | * | Update plugin versions to 23.0.1Siva Velusamy2014-06-2752-82/+82
| |/ / | | | | | | | | | Change-Id: Icb5be47b688808488811411a5f45a23a49f774d2
* | | Merge "Fix proguard packaging in the tools." into idea133Xavier Ducrohet2014-06-271-0/+53
|\ \ \ | |/ / | | | | | | | | | | | | | | | automerge: 327b773 * commit '327b7734e8a3a499671f00a810b8b9ebb8a5a610': Fix proguard packaging in the tools.
| * | Merge "Fix proguard packaging in the tools." into idea133Xavier Ducrohet2014-06-261-0/+53
| |\ \
| | * | Fix proguard packaging in the tools.Xavier Ducrohet2014-06-271-0/+53
| | |/ | | | | | | | | | Change-Id: I061734afecaca30582e6659303c17b2154be8f47
* | | Merge "Build and release annotations.jar" into idea133Siva Velusamy2014-06-272-0/+210
|\ \ \ | |/ / | | | | | | | | | | | | | | | automerge: 82ff48b * commit '82ff48bd845a8aee9d51cf31faa8c24b0fae06aa': Build and release annotations.jar
| * | Merge "Build and release annotations.jar" into idea133Siva Velusamy2014-06-262-0/+210
| |\ \
| | * | Build and release annotations.jarSiva Velusamy2014-06-272-0/+210
| | |/ | | | | | | | | | Change-Id: If36461c0f2358273f6d781ed9fbb039d6090b18c
* | | Merge "monitor: Update path to hprof-conv" into idea133Siva Velusamy2014-06-271-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | automerge: d187c91 * commit 'd187c91b92e0609696225fdae0aa905058596df8': monitor: Update path to hprof-conv
| * | Merge "monitor: Update path to hprof-conv" into idea133Siva Velusamy2014-06-261-1/+1
| |\ \ | | |/ | |/|
| | * 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-216-27/+31
|\ \ | |/ | | | | | | | | | | automerge: 2206210 * commit '220621089bd6a7cfac2c3d1a0fa8aeeffc94391b': Fix zipalign/hprof-conv issue in ADT.
| * Merge "Fix zipalign/hprof-conv issue in ADT." into idea133Xavier Ducrohet2014-06-206-27/+31
| |\
| | * Fix zipalign/hprof-conv issue in ADT.Xavier Ducrohet2014-06-216-27/+31
| | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Merge "Remove ADT branding from p2 repo" into idea133Siva Velusamy2014-06-201-3/+0
| |\ \ | | |/ | |/|
| | * Remove ADT branding from p2 repoSiva Velusamy2014-06-211-3/+0
| |/ | | | | | | Change-Id: I65a6ab62f3aa90e5c6b17c91ab720c7b1cb92539
* | Merge "Enable large sd cards." into idea133Xavier Ducrohet2014-06-191-0/+4
|\ \ | |/ | | | | | | | | | | automerge: b554f97 * commit 'b554f97341e9ac128bcf23df74667c53fdafb670': Enable large sd cards.
| * Merge "Enable large sd cards." into idea133Xavier Ducrohet2014-06-171-0/+4
| |\
generated by cgit v1.1 at 2025-03-25 19:25:13 +0000