aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "emulator/opengl: Prepare for 64-bit build changes." into idea133David 'Digit' Turner2014-06-1113-22/+24
|\ | | | | | | | | | | | | automerge: 343a78f * commit '343a78fae064d666b02416b56039b86c554fa615': emulator/opengl: Prepare for 64-bit build changes.
| * Merge "emulator/opengl: Prepare for 64-bit build changes." into idea133David 'Digit' Turner2014-06-1013-22/+24
| |\
| | * emulator/opengl: Prepare for 64-bit build changes.David 'Digit' Turner2014-06-1113-22/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch slightly modifies the build files for the GPU emulation libraries to prepare for future changes in the emulator-specific build system that will be necessary to support Win64 binaries. The main difference is the introduction of 64-bit versions of the emugl-begin-host-<type> macros, named emugl-begin-host64-<type>. Change-Id: Ib40c030fa407b0ed951755dd9b007fda85778e03
* | | Merge "Fix classpath for test plugins" into idea133Siva Velusamy2014-06-113-8/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | automerge: a1b9c29 * commit 'a1b9c2959460852c13c18addb428224a94c72439': Fix classpath for test plugins
| * | Merge "Fix classpath for test plugins" into idea133Siva Velusamy2014-06-103-8/+8
| |\ \
| | * | Fix classpath for test pluginsSiva Velusamy2014-06-103-8/+8
| |/ / | | | | | | | | | Change-Id: Icee859d2e325cf4bc46509cf098c52e5940e9f58
* | | Merge "Revert back from OSGI -> bundled jars" into idea133Siva Velusamy2014-06-1036-107/+296
|\ \ \ | |/ / | | | | | | | | | | | | | | | automerge: 4da1c1f * commit '4da1c1feb088bfd2754d02a4244530482a6dde3f': Revert back from OSGI -> bundled jars
| * | Merge "Revert back from OSGI -> bundled jars" into idea133Siva Velusamy2014-06-1036-107/+296
| |\ \
| | * | 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
* | | | Merge "Add script to bundle jars inside plugin\'s libs folder." into idea133Siva Velusamy2014-06-101-0/+155
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | automerge: 86fcdd2 * commit '86fcdd206ee4f5553e9b646c61887ef21d88019c': Add script to bundle jars inside plugin's libs folder.
| * | | Merge "Add script to bundle jars inside plugin's libs folder." into idea133Siva Velusamy2014-06-101-0/+155
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * 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-101-1/+1
|\ \ | |/ | | | | | | | | | | automerge: 14338f9 * commit '14338f93d7ab117bbc0f15e206622a99e1ff9d2f': Fix title bar to say "Android Device monitor"
| * 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-101-2/+2
|\ \ | |/ | | | | | | | | | | automerge: 183aa4f * commit '183aa4f4213a03aa4081aec487bec101db64b3f7': emulator/opengl: Fix compilation with Mingw64 toolchain.
| * 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-101-2/+2
|\ \ | |/ | | | | | | | | | | | | | | idea133 automerge: 3e92426 * commit '3e924260e43a43057196e98976a5c4643eb7a480': emulator/opengl: Fix GPU emulation library crash on Windows.
| * 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-091-0/+25
|\ \ \ | |/ / | | | | | | | | | | | | | | | automerge: af590e0 * commit 'af590e034788bbccd804f8b2d149071c1f899b91': Create a target platform for dev environment.
| * | 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
* | am 662a8c9d: Merge "opengl: rcOpenColorBuffer must be synchronous" into ↵David Turner2014-05-286-13/+24
|\ \ | | | | | | | | | | | | | | | | | | idea133 automerge: a509402 * commit '662a8c9ddb160ed08b1b8b7a4290b20665d2fc0e': opengl: rcOpenColorBuffer must be synchronous
| * \ Merge "opengl: rcOpenColorBuffer must be synchronous" into idea133David Turner2014-05-286-13/+24
| |\ \ | | |/ | | | | | | | | | | | | | | | automerge: a509402 * commit 'a509402a6b907a871b62f89ea713ff63286c23ae': opengl: rcOpenColorBuffer must be synchronous
| | * 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
* | | | am 315e2bd3: Merge "Fix ADT." into idea133 automerge: c06a076Xavier Ducrohet2014-05-281-4/+12
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '315e2bd36eb2ecac8419f7b372163ec919278a4d': Fix ADT.
| * | | Merge "Fix ADT." into idea133Xavier Ducrohet2014-05-281-4/+12
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | automerge: c06a076 * commit 'c06a076f6795edaf3baf1ec24d732080b4433ec1': Fix ADT.
| | * | Merge "Fix ADT." into idea133Xavier Ducrohet2014-05-281-4/+12
| | |\ \ | | | |/ | | |/|
| | | * Fix ADT.Xavier Ducrohet2014-05-271-4/+12
| | |/ | | | | | | | | | Change-Id: Ib685bfa749b63f9e04f9990459ad47b2d812f692
* | | am 79f862d4: Merge "Include all dependencies in the p2 repository" into ↵Siva Velusamy2014-05-281-0/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | idea133 automerge: 93aa027 * commit '79f862d45273eb18c2aaea4ec3d3ae25a6c8c4f5': Include all dependencies in the p2 repository
| * | Merge "Include all dependencies in the p2 repository" into idea133Siva Velusamy2014-05-281-0/+9
| |\ \ | | |/ | | | | | | | | | | | | | | | automerge: 93aa027 * commit '93aa02793ea1594d788a3ec67139db183dc307b4': Include all dependencies in the p2 repository
| | * 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
* | | am 2c49eafd: Merge "Enable building with Tycho" into idea133 automerge: 4648148Siva Velusamy2014-05-281-22/+54
|\ \ \ | |/ / | | | | | | | | | * commit '2c49eafd44cc0556879e6e604d1bbb398a66e057': Enable building with Tycho
| * | Merge "Enable building with Tycho" into idea133Siva Velusamy2014-05-281-22/+54
| |\ \ | | |/ | | | | | | | | | | | | | | | automerge: 4648148 * commit '4648148c1e87bac9aa326ba942bc065e0731733b': Enable building with Tycho
| | * Merge "Enable building with Tycho" into idea133Siva Velusamy2014-05-221-22/+54
| | |\
| | | * Enable building with TychoSiva Velusamy2014-05-221-22/+54
| | |/ | | | | | | | | | Change-Id: I728dbb397a6a80b10f15785323e1231c89778e7c
* | | am 02a8e04d: Merge "Fix path to GrabProcessOutput" into idea133 automerge: ↵Siva Velusamy2014-05-285-15/+15
|\ \ \ | |/ / | | | | | | | | | | | | | | | 2fbf149 * commit '02a8e04d3b03e7ee8a4b9923a83c6e5ac02fd526': Fix path to GrabProcessOutput
| * | Merge "Fix path to GrabProcessOutput" into idea133Siva Velusamy2014-05-285-15/+15
| |\ \ | | |/ | | | | | | | | | | | | | | | automerge: 2fbf149 * commit '2fbf149ea861cad6338576f6222d29a6ed400987': Fix path to GrabProcessOutput
| | * Merge "Fix path to GrabProcessOutput" into idea133Siva Velusamy2014-05-225-15/+15
| | |\
| | | * Fix path to GrabProcessOutputSiva Velusamy2014-05-225-15/+15
| | |/ | | | | | | | | | Change-Id: I58365108cd065a5ef710514f834741202af08666
* | | am e5d6e995: Merge "Add scripts to enable Tycho build, take 2." into idea133 ↵Siva Velusamy2014-05-2857-170/+1180
|\ \ \ | |/ / | | | | | | | | | | | | | | | automerge: 11f179f * commit 'e5d6e995cdcc790a79b91f5dbbdc057849a886f2': Add scripts to enable Tycho build, take 2.
| * | Merge "Add scripts to enable Tycho build, take 2." into idea133Siva Velusamy2014-05-2857-170/+1180
| |\ \ | | |/ | | | | | | | | | | | | | | | automerge: 11f179f * commit '11f179ff8739e9e638d88610b51b8597bff0ce67': Add scripts to enable Tycho build, take 2.
| | * 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
* | | am 1c77e3df: Merge "Override freemarker manifest" into idea133 automerge: ↵Siva Velusamy2014-05-281-1/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | bb11376 * commit '1c77e3df9a7157b94df6579f2bd2b767649f384b': Override freemarker manifest
| * | Merge "Override freemarker manifest" into idea133Siva Velusamy2014-05-281-1/+9
| |\ \ | | |/ | | | | | | | | | | | | | | | automerge: bb11376 * commit 'bb11376a4004aabe6350316ef83f4a31fa52e457': Override freemarker manifest
generated by cgit v1.1 at 2025-10-26 19:49:47 +0000