aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Update Guava 15.0 -> 17.0" into studio-1.0-devSiva Velusamy2014-10-275-13/+30
|\
| * Update Guava 15.0 -> 17.0Siva Velusamy2014-10-275-13/+30
|/ | | | Change-Id: If666053e03e67b49c3337129be869ebe996ec58d
* Merge "find_java: new method to search in a custom path" into studio-1.0-devDavid Herman2014-10-102-1/+17
|\
| * find_java: new method to search in a custom pathDavid Herman2014-10-102-1/+17
| | | | | | | | Change-Id: I081871bbff9c6e714eda3e47ee16e8b486e2355b
* | Merge "find_java.sln (and related project files) updated" into studio-1.0-devDavid Herman2014-10-1014-803/+508
|\ \ | |/
| * find_java.sln (and related project files) updatedDavid Herman2014-10-1014-803/+508
|/ | | | | | | | - Paths needed to be updated from find_java to find_java/src/source - Some projects weren't compiling and needed to include references to various .cpp files Change-Id: I495905ef37a693d25cf34410dc395c9ae074b1da
* Merge "Adjust ADT to new ITestRunListener changes." into studio-1.0-devSiva Velusamy2014-09-232-10/+33
|\
| * Adjust ADT to new ITestRunListener changes.Brett Chabot2014-09-232-10/+33
|/ | | | | | | | | | This fixes ADT so it compiles against the ITestRunListener changes made to support new JUnit4 states. It does not change ADT to truly support junit4: eg use the junit4.runtime plugin, pass assumptionfailure and ignored test states back to eclipse UI, etc Bug: 16684768 Change-Id: I16ee8d6d863a17fe061446f4ced6ce0ec3780600
* Merge "FindJava2+WinLauncher2 MFC app for Windows." into idea133Raphael Moll2014-09-1928-0/+2741
|\
| * FindJava2+WinLauncher2 MFC app for Windows.Raphael Moll2014-09-1628-0/+2741
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the code base we have a "find_java" directory that compiles using mingw32 + an Android.mk; it is used to create the find_java.dll used by the NSIS installer, the find_java.exe that is used by android.bat to locate java before executing the SDK/AVD Manager and finally also used by the Android Studio WinLauncher. This reworks find_java to create 2 new MFC apps: - FindJava2 is a straight replacement for the previous find_java.exe. - WinLauncher2 will be a replacement for the Studio launcher. The main change is that the new app has a UI so it lists all the Java.exe paths and let the user add his/her own. Then it remembers the selected path using a registry key and reuses the next time if it's available. The app is built using VS2013 and MFC and there's no Android.mk for it. The goal is to just make prebuilts (that's how find_java.exe/dll and WinLauncher are actually used right now.) The FindJava2 part is final. What's left to do: - Merge the code of WinLauncher into WinLauncher2 to actually run Studio (they will be a need for both a 32-bit version and 64-bit version support.) - Create a new FindJava2.dll for NSIS once we decide how we want to use this in the new installer (e.g. do we just want to make sure there is "some" version of Java or do we want to include the select-and-register functionality too so that the user doesn't have to be asked again later?) Change-Id: I814ed46711ac17a66cd63b9e7c7d485632169ff1
* Merge "Track lint API changes in the Eclipse lint integration" into idea133Tor Norbye2014-09-1510-26/+34
|\
| * Track lint API changes in the Eclipse lint integrationTor Norbye2014-09-1510-26/+34
|/ | | | Change-Id: If9c6843f0b9231a2b629e61ab7b8c3a401485f1f
* Merge "Update tools to revision 23.0.4" into idea133Siva Velusamy2014-09-051-1/+1
|\
| * Update tools to revision 23.0.4Raphael Moll2014-09-051-1/+1
|/ | | | | | Manually cherry picked from Change-Id: I16fff6eacb891750346272b0ab56beccf3772289 Change-Id: I008450ccb305ed05c7bbdea2e75094ba1f6ba21c
* Merge "Update ADT version to 23.0.4" into idea133Raphael Moll2014-09-0353-77/+77
|\
| * Update ADT version to 23.0.4Raphael Moll2014-09-0353-77/+77
|/ | | | Change-Id: I77448d2769d2a15b64987ae7d9e2cb887aef3bc2
* Merge "Match language-specific flags before default locale country matches" ↵Tor Norbye2014-09-021-11/+12
|\ | | | | | | | | | | | | | | | | into idea133 automerge: 1687a96 * commit '1687a96922879da90952b9f363380eb923ee700c': Match language-specific flags before default locale country matches
| * Merge "Match language-specific flags before default locale country matches" ↵Tor Norbye2014-08-291-11/+12
| |\ | | | | | | | | | into idea133
| | * Match language-specific flags before default locale country matchesTor Norbye2014-08-291-11/+12
| |/ | | | | | | | | | | Fixes issue 75173. Change-Id: Ic825a50664e2c6bae47499482ead8f60a3758787
* | Merge "emulator/opengl: Cleanup build files + remove obsolete tests."David 'Digit' Turner2014-08-2962-6756/+84
|\ \ | |/ |/|
| * emulator/opengl: Cleanup build files + remove obsolete tests.David 'Digit' Turner2014-08-2762-6756/+84
|/ | | | | | | | | | | | | | | | | | | | | | This patch cleans up the build files for the GPU emulation libraries (i.e. there is no need to test for BUILD_EMULATOR_64BITS anymore, filtering is now handled by the build system directly). + Remove a bunch obsolete tests, which were not unit tests, despite their name beginning with ut_xxxx. Which includes removing dependency on SDL too. + Remove -m64 and -fPIC flags from compilation. These are not necessary anymore (again, the build system now takes charge of placing them when necessary), and generated link-time warning when building Windows executables. + Remove a few declarations related to the now-obsolete platform build (these libraries are only built with the emulator's build system now). Change-Id: I27c28979c42cd51f2fe9e30edd4141136e80ee03
* Merge "gltrace: Increase launch timeout" into idea133Siva Velusamy2014-08-181-1/+1
|\ | | | | | | | | | | | | automerge: 1d55d41 * commit '1d55d413646dfc6f4d95e4f74a5bfdd7ed1c23cd': gltrace: Increase launch timeout
| * Merge "gltrace: Increase launch timeout" into idea133Siva Velusamy2014-08-161-1/+1
| |\
| | * gltrace: Increase launch timeoutSiva Velusamy2014-08-181-1/+1
| |/ | | | | | | | | | | b/17106700 Change-Id: I584d546502535d5390ca7b24029205895ce97550
* | Merge "Change Device List to Device Collection." into idea133Deepanshu Gupta2014-08-158-21/+27
|\ \ | |/ | | | | | | | | | | automerge: b0e06f6 * commit 'b0e06f6fcfc02a35f086367ccef8294b0f9376e3': Change Device List to Device Collection.
| * Merge "Change Device List to Device Collection." into idea133Deepanshu Gupta2014-08-158-21/+27
| |\
| | * Change Device List to Device Collection.Deepanshu Gupta2014-08-158-21/+27
| |/ | | | | | | | | | | | | sdklib now stores devices as LinkedHashSet. Change the List to a Collection so that it's agnostic of the underlying representation. Change-Id: I14a20d7fff6495c0d61c6f250a92cfe9210b50d9
* | Merge "gltrace: Increase TEXTURE_UNIT_COUNT and MAX_VERTEX_ATTRIBS" into idea133Siva Velusamy2014-08-141-2/+2
|\ \ | |/ | | | | | | | | | | automerge: 4d05f33 * commit '4d05f33f9ac64d5570e0ae841bcb33101a8f1ba3': gltrace: Increase TEXTURE_UNIT_COUNT and MAX_VERTEX_ATTRIBS
| * Merge "gltrace: Increase TEXTURE_UNIT_COUNT and MAX_VERTEX_ATTRIBS" into idea133Siva Velusamy2014-08-141-2/+2
| |\
| | * gltrace: Increase TEXTURE_UNIT_COUNT and MAX_VERTEX_ATTRIBSSiva Velusamy2014-08-141-2/+2
| |/ | | | | | | | | | | | | This is a short term workaround until the state information can be updated properly with actual values from the device. Change-Id: I4387613f320deb9a88d3810a81910f348c9839f6
* | Merge "Support dynamic lib name without ".dylib" on Mac"David Turner2014-07-233-4/+44
|\ \
| * | Support dynamic lib name without ".dylib" on MacTina Zhang2014-07-273-4/+44
|/ / | | | | | | | | | | | | | | | | | | On Mac, some of the dynamic libs has name without ".dylib". Like, "System/Library/Frameworks/OpenGL.framework/OpenGL", we need solution to handle it in the dlopen() API. Change-Id: Ie513ace5a0d7d154f73e0f13919005d1498901d7 Signed-off-by: Tina Zhang <tina.zhang@intel.com> Signed-off-by: Chao Qin <chaox.qin@intel.com>
* | Merge "monitor: Move from sdk/ to sdk/eclipse" into idea133Siva Velusamy2014-07-234-4/+2
|\ \ | |/ | | | | | | | | | | automerge: f68260f * commit 'f68260f91fe2eee6687d6108eaff2d8f9319937d': monitor: Move from sdk/ to sdk/eclipse
| * Merge "monitor: Move from sdk/ to sdk/eclipse" into idea133Siva Velusamy2014-07-234-4/+2
| |\
| | * monitor: Move from sdk/ to sdk/eclipseSiva Velusamy2014-07-234-4/+2
| |/ | | | | | | | | | | | | | | | | | | The monitor Gradle build script assumed that the version of monitor matches the tools. However, it really matches the version of the Eclipse plugins. This CL moves monitor into the eclipse folder so that the version updater script handles the version encoded inside monitor's build script. Change-Id: I31e70bfc705af00fbaacde417cf505740701038b
* | Merge "Merge commit 'ae461d3' into mmerge"Siva Velusamy2014-07-234-239/+0
|\ \
| * \ Merge commit 'ae461d3' into mmergeSiva Velusamy2014-07-234-239/+0
| |\ \ |/ / / | | _ | | | | | | | | Conflicts: monitor/Android.mk Change-Id: Ibea7e6fba180f1527bcd97576ab4e00cda8625f3
| * Merge "monitor: Remove old build scripts and instructions" into idea133Siva Velusamy2014-07-234-230/+0
| |\
| | * monitor: Remove old build scripts and instructionsSiva Velusamy2014-07-234-230/+0
| |/ | | | | | | Change-Id: Ieff81be1ef4ecf73de2c4946e7c21988bcac768d
* | Merge "Include JDT as a required dependency" into idea133Siva Velusamy2014-07-221-0/+1
|\ \ | |/ | | | | | | | | | | automerge: b282ba8 * commit 'b282ba8d3d00ea5cc9df539492f06ced394463f9': Include JDT as a required dependency
| * Merge "Include JDT as a required dependency" into idea133Siva Velusamy2014-07-221-0/+1
| |\
| | * Include JDT as a required dependencySiva Velusamy2014-07-221-0/+1
| |/ | | | | | | | | | | | | | | | | | | JDT itself was included, but without this explicit requirement, the annotations processing (apt) plugins (org.eclipse.jdt.adt.*) weren't being installed. https://code.google.com/p/android/issues/detail?id=73798 Change-Id: Id097200c044cb840ea961bd51878a6b21a3026ca
* | Merge "Add NDK plugin to ADT package feature" into idea133Siva Velusamy2014-07-221-0/+1
|\ \ | |/ | | | | | | | | | | automerge: d4ce9eb * commit 'd4ce9eb0eddd3faf21dbcc66c1764113f242d66b': Add NDK plugin to ADT package feature
| * Merge "Add NDK plugin to ADT package feature" into idea133Siva Velusamy2014-07-221-0/+1
| |\
| | * Add NDK plugin to ADT package featureSiva Velusamy2014-07-211-0/+1
| | | | | | | | | | | | Change-Id: I9fe8bf7cc4e5a744d7e20357e48615fec38a5b19
* | | 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
| * | Merge "Update Eclipse plugins' version from 23.0.2 -> 23.0.3" into idea133Siva Velusamy2014-07-2252-76/+76
| |\ \ | | |/
| | * 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
| |\
generated by cgit v1.1 at 2025-02-14 01:44:31 +0000