aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert back from OSGI -> bundled jarsSiva Velusamy2014-06-1036-107/+296
| | | | | | | | | | | | | | | | | | | | | We tried the approach of replacing bundled jars with OSGI jars. However, this eventually ended up resulting in ClassCircularityError thrown at runtime when running on Java 7. As far as we could diagnose, the issue seems to be that: - LayoutLibrary attempts to load layoutlib.jar (which is a regular jar present inside the android sdk data folder). - The class loader passed to layoutlib is the LayoutLibrary's class loader. - The classes inside the layout library then attempt to load classes from a different OSGI jar (layoutlib-api) - At this time, we receive a ClassCircularityError Most of our other jars depend on layoutlib-api, so it is not possible to just bundle layoutlib-api. So for now, we are back to bundling jars. Change-Id: Ic8c838a1a7e90e1bc6b8c5251341b1ded46053ba
* Add script to bundle jars inside plugin's libs folder.Siva Velusamy2014-06-101-0/+155
| | | | | | | | | This CL adds a build script that replaces the existing create_symlinks script. This script will analyze the dependencies specified inside the MANIFEST.MF and copy all the libraries specified as required bundles. Change-Id: I346ba4206868cc04192eae678e66a5b236732758
* Merge "Fix title bar to say "Android Device monitor"" into idea133Siva Velusamy2014-06-041-1/+1
|\
| * Fix title bar to say "Android Device monitor"Siva Velusamy2014-06-041-1/+1
|/ | | | Change-Id: I5725e4f941771f8dc3a01e4cf97a896fcf7d0bd3
* Merge "emulator/opengl: Fix compilation with Mingw64 toolchain." into idea133David 'Digit' Turner2014-06-041-2/+2
|\
| * emulator/opengl: Fix compilation with Mingw64 toolchain.David 'Digit' Turner2014-06-041-2/+2
|/ | | | | | | | | | When using the newest Mingw64 toolchain, both the forward declaration and the definition of functions need to use GLAPI / GLAPIENTRY or the compiler will complain. BUG=15402623 Change-Id: Ida9e1cb9b177759e7d6688dc1d883dd856abda04
* Merge "emulator/opengl: Fix GPU emulation library crash on Windows." into ↵David 'Digit' Turner2014-06-041-2/+2
|\ | | | | | | idea133
| * emulator/opengl: Fix GPU emulation library crash on Windows.David 'Digit' Turner2014-06-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The definitions of two EGL translator functions were missing EGLAPI / EGLAPIENTRY macros. On Windows, these enforces the __stdcall procedure call modifier, which changes the way the stack pointer is modified on function exit. Without this patch, a call to these function will result in a corrupted stack pointer in the caller, quickly followed by a random crash. BUG=15402623 Change-Id: Ia0f7ebef29e1252086fb59ebf2e6f907c2a69487
* | Merge "Create a target platform for dev environment." into idea133Deepanshu Gupta2014-06-031-0/+25
|\ \ | |/ |/|
| * Create a target platform for dev environment.Deepanshu Gupta2014-06-031-0/+25
|/ | | | Change-Id: Id64b765f140d13872420ae83c1c815eec197200e
* Merge "opengl: rcOpenColorBuffer must be synchronous" into idea133David Turner2014-05-286-13/+24
|\
| * opengl: rcOpenColorBuffer must be synchronousJesse Hall2014-05-276-13/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | The gralloc register_buffer() function, which calls rcOpenColorBuffer, must actually increment the reference count before returning. Otherwise the buffer allocator may release its reference before the client has obtained one, and the buffer will be freed prematurely. Since rcOpenColorBuffer was just sending a message to the host without waiting for it to be received/processed, this guarantee was not met. Adding a return value makes the call synchronous. Bug: 12988668 Change-Id: I8b2399cfb0f600f99b3387f630343291b59bc9a6
* | Merge "Fix ADT." into idea133Xavier Ducrohet2014-05-281-4/+12
|\ \ | |/ |/|
| * Fix ADT.Xavier Ducrohet2014-05-271-4/+12
|/ | | | Change-Id: Ib685bfa749b63f9e04f9990459ad47b2d812f692
* Merge "Include all dependencies in the p2 repository" into idea133Siva Velusamy2014-05-221-0/+9
|\
| * Include all dependencies in the p2 repositorySiva Velusamy2014-05-221-0/+9
|/ | | | | | | | | | | | Currently, the generated p2 repository only includes the ADT plugins. We need to include all the tools and prebuilts that are now OSGI bundles, so this CL instructs p2 to include all the dependencies as well. Unfortunately, this means that all of the platform, jdt, cdt are all included as well. Change-Id: I5d2bfc8f72b18145e60985bffb54074a83a7d26a
* Merge "Enable building with Tycho" into idea133Siva Velusamy2014-05-221-22/+54
|\
| * Enable building with TychoSiva Velusamy2014-05-221-22/+54
|/ | | | Change-Id: I728dbb397a6a80b10f15785323e1231c89778e7c
* Merge "Fix path to GrabProcessOutput" into idea133Siva Velusamy2014-05-225-15/+15
|\
| * Fix path to GrabProcessOutputSiva Velusamy2014-05-225-15/+15
|/ | | | Change-Id: I58365108cd065a5ef710514f834741202af08666
* Merge "Add scripts to enable Tycho build, take 2." into idea133Siva Velusamy2014-05-2257-170/+1180
|\
| * Add scripts to enable Tycho build, take 2.Siva Velusamy2014-05-2257-170/+1180
|/ | | | | | | The earlier CL to add this broke the existing PDE build scripts. The PDE build has now been turned off. Change-Id: Ica3b783af117ff1e52f53e6813ac8389c4bb80c9
* Merge "Override freemarker manifest" into idea133Siva Velusamy2014-05-221-1/+9
|\
| * Override freemarker manifestSiva Velusamy2014-05-221-1/+9
|/ | | | | | | Rewrite freemarker manifest to override the incorrect execution environments specified in its existing manifest. Change-Id: I2cc78ca2a12fe2b1b310f57a75e1c9dac9c713ca
* Merge "Add ADT & Monitor launch configurations" into idea133Siva Velusamy2014-05-222-0/+65
|\
| * Add ADT & Monitor launch configurationsSiva Velusamy2014-05-212-0/+65
| | | | | | | | Change-Id: I54c1a25c0d135f7466da408a10131a46335b425f
* | Merge "Replace bundled libraries with OSGI bundle dependencies" into idea133Siva Velusamy2014-05-2230-277/+75
|\ \ | |/
| * Replace bundled libraries with OSGI bundle dependenciesSiva Velusamy2014-05-2130-277/+75
|/ | | | | | | | | | | | This CL removes all the jars bundled in inside the libs folder and adds explicit dependencies on OSGI bundles for each of the dependencies. See eec615b94b504de6d87702b830a6fc85fc7d5108 for more info on how the dependency jars are converted into OSGI bundles. Change-Id: I5356edc2ca857ea961392c599fa0e985b16b4b2d
* Merge "No need to use -SNAPSHOT for tools jars" into idea133Siva Velusamy2014-05-221-20/+20
|\
| * No need to use -SNAPSHOT for tools jarsSiva Velusamy2014-05-211-20/+20
|/ | | | Change-Id: Iac9f92a39dbe8bf1873d103753d37f2774f2716f
* Merge "Add script to convert from maven repo to p2 repo" into idea133Siva Velusamy2014-05-212-0/+202
|\
| * Add script to convert from maven repo to p2 repoSiva Velusamy2014-05-212-0/+202
| | | | | | | | Change-Id: I4e5d7fa81710a592913f89e2c2559c5ec5d6dfcc
* | Merge "Fix problems completing filenames with spaces." into idea133Siva Velusamy2014-05-211-1/+1
|\ \ | |/ |/|
| * Fix problems completing filenames with spaces.Jeff Brown2014-05-211-1/+1
|/ | | | | | | | | Set the IFS variable to prevent the shell from breaking the array generated by compgen at space boundaries. This was done in other completion functions but oddly missed in the filename completion function. Change-Id: I23245fc344b2b9d21aa664ebcfdb2c8ddb9da650
* Merge "emulator/opengl: A few debugging, stability improvements to emugl" ↵David Turner2014-05-213-4/+8
|\ | | | | | | into idea133
| * emulator/opengl: A few debugging, stability improvements to emuglKen Mixter2014-05-213-4/+8
|/ | | | | | | | | | | | | | | | | | | * Zero output parameters so that errors don't return random data (even if the target code was careful to zero its output parameters.) Spec says that we will not modify values in case of an error, which is not currently possible, but at least this means we return deterministic values. * Similarly, avoid passing uninitialized data if an error occurs during getting the viewport. * Fix a bug where glGetError may be called when NULL is decoded in CHECK_GL_ERROR mode. * Output more information about the stream in DEBUG_PRINTOUT mode to help separate from multiple streams. Change-Id: I31706b92642efe4c7ed38d178b49e72835a9c9a6
* Merge "Update to new notice support." into idea133Xavier Ducrohet2014-05-207-45/+1005
|\
| * Update to new notice support.Xavier Ducrohet2014-05-207-45/+1005
|/ | | | | | | Update the build.gradle file to specify notice files, add missing notice files. Change-Id: Ib5e56bb1c53de3584f3942643bbdf736a872dc06
* Merge "Add emulator bios files." into idea133Xavier Ducrohet2014-05-161-0/+3
|\
| * Add emulator bios files.Xavier Ducrohet2014-05-151-0/+3
|/ | | | Change-Id: Ie0f608723954a350cdb3511167fe8ac79f9d2388
* Merge "Fix build of mksdcard with Gradle." into idea133Xavier Ducrohet2014-05-151-9/+0
|\
| * Fix build of mksdcard with Gradle.Xavier Ducrohet2014-05-151-9/+0
|/ | | | Change-Id: I6126f49ecfa417c3aace65ff5b72cf6ec8678ddd
* Merge "Build mksdcard for mac/linux with Gradle." into idea133Xavier Ducrohet2014-05-155-14/+79
|\
| * Build mksdcard for mac/linux with Gradle.Xavier Ducrohet2014-05-155-14/+79
|/ | | | Change-Id: Ie7db983ab953ee3820189e9eb0f4cf47fe40d1e5
* Merge "Build script for ADT that will be invoked by the build server" into ↵Siva Velusamy2014-05-091-0/+37
|\ | | | | | | idea133
| * Build script for ADT that will be invoked by the build serverSiva Velusamy2014-05-091-0/+37
|/ | | | | | | | This script will be invoked by the build server. It should eventually build the plugins and the ADT bundle and drop them in the dist folder provided to it as an argument. Change-Id: Ia5cd53ee50700e69c67a76dea3d8701e2fbb76cf
* Merge "A build.gradle for sdk components." into idea133Xavier Ducrohet2014-05-081-0/+41
|\
| * A build.gradle for sdk components.Xavier Ducrohet2014-05-081-0/+41
|/ | | | Change-Id: If1005dc809110125ab3faf2a6c83642d34be3442
* Merge "Remove sdk tools from the build." into idea133Xavier Ducrohet2014-05-085-6/+6
|\
| * Remove sdk tools from the build.Xavier Ducrohet2014-05-085-6/+6
|/ | | | Change-Id: I193c6e3e5a2c687149044a998fb631d1cdf6f998
generated by cgit v1.1 at 2024-12-27 18:15:50 +0000