summaryrefslogtreecommitdiffstats
path: root/core/jni/Android.mk
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 800d4d72 to masterKristian Monsen2013-12-121-1/+3
|\
| * Fix one and hide the other warnings from core/jniKristian Monsen2013-12-111-0/+3
| * Merge commit 'bac61807d3bcfff957b358cb9ad77850bd373689' into HEADThe Android Open Source Project2013-12-051-1/+0
| |\
| * | wifi: Remove obsolete libwpa_client libraryDmitry Shmidt2013-12-051-1/+0
* | | RenderThread workJohn Reck2013-12-091-0/+1
* | | wifi: Remove obsolete libwpa_client libraryDmitry Shmidt2013-11-221-1/+0
* | | Merge "Initial integration of Minikin to framework"Raph Levien2013-11-181-0/+11
|\ \ \
| * | | Initial integration of Minikin to frameworkRaph Levien2013-11-181-0/+11
| | |/ | |/|
* | | Merge "More refactoring"John Reck2013-11-111-1/+1
|\ \ \
| * | | More refactoringJohn Reck2013-11-111-1/+1
| |/ /
* | | Disable unused parameter warning for jni codeMichael Wright2013-11-071-0/+1
|/ /
* | Plumb through physical device UUID and label.Jeff Sharkey2013-10-161-1/+0
|/
* Add Graphics alloc tracking via memtrackAdam Lesinski2013-09-251-0/+1
* Move PdfDocument to android.graphics.pdfSvetoslav2013-09-191-1/+1
* Merge "Remove a fixed-length buffer in the wifi code." into klp-devElliott Hughes2013-08-191-1/+1
|\
| * Remove a fixed-length buffer in the wifi code.Elliott Hughes2013-08-161-1/+1
* | Richer ParcelFileDescriptor close events.Jeff Sharkey2013-08-161-1/+0
|/
* Changes needed to support Skia at r10377.Derek Sollenberger2013-08-011-4/+0
* Camera2 API: Rename package to android.hardware.camera2Eino-Ville Talvala2013-07-301-1/+1
* get rid of PixelFormatInfo and simplify thingsMathias Agopian2013-07-251-1/+0
* camera2 api: Add CameraMetadata get/set supportIgor Murashkin2013-07-111-0/+1
* Move input library code to frameworks/native.Jeff Brown2013-07-011-0/+1
* Initial camera device implementationIgor Murashkin2013-06-261-0/+2
* Revert "Initial camera device implementation"Igor Murashkin2013-06-251-2/+0
* Initial camera device implementationIgor Murashkin2013-06-241-0/+2
* Merge "Generate PDF from Canvas."Svetoslav Ganov2013-06-211-0/+2
|\
| * Generate PDF from Canvas.Svetoslav Ganov2013-06-191-0/+2
* | Remove libdvm dependencyBrian Carlstrom2013-06-201-1/+0
|/
* Modifications needed for updating Skia to r9286.Derek Sollenberger2013-05-281-4/+4
* am bf7afa23: am 94f55b30: Merge "Tracking libnativehelper dependencies"Brian Carlstrom2013-05-101-0/+1
|\
| * am 94f55b30: Merge "Tracking libnativehelper dependencies"Brian Carlstrom2013-05-101-0/+1
| |\
| | * Tracking libnativehelper dependenciesBrian Carlstrom2013-05-101-1/+2
* | | am 4d32a367: am 2787ba25: Merge "Register EGLExt JNI methods" into jb-mr2-devJesse Hall2013-05-071-0/+1
|\ \ \ | |/ /
| * | Register EGLExt JNI methodsJesse Hall2013-05-061-0/+1
* | | Pack preloaded framework assets in a texture atlasRomain Guy2013-05-021-0/+1
|/ /
* | Rewrite input handling for native applicationsMichael Wright2013-04-221-0/+1
* | Add android.opengl.GLES30, hidden for nowJesse Hall2013-04-151-0/+1
* | Add liblogYing Wang2013-04-091-0/+1
* | Use input transport for communications between app and IME.Jeff Brown2013-03-261-0/+1
* | am 582c5b85: am 690d3435: Merge "jni: remove obsolete flag from makefile"Elliott Hughes2013-03-051-4/+0
|\ \ | |/
| * jni: remove obsolete flag from makefileBruce Beare2013-03-051-4/+0
* | resolved conflicts for merge of 58a1ca66 to master-chromiumKristian Monsen2013-02-141-0/+1
|\ \
| * \ Merge "split Surface in two classes: SurfaceControl and Surface"Mathias Agopian2013-02-141-0/+1
| |\ \
| | * | split Surface in two classes: SurfaceControl and SurfaceMathias Agopian2013-02-141-0/+1
* | | | am aec6bcfb: Merge "Parse network stats using native code."Jeff Sharkey2013-02-131-2/+3
|\ \ \ \ | |/ / /
| * | | Parse network stats using native code.Jeff Sharkey2013-02-131-2/+3
| |/ /
| * | Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master...Chris Craik2013-02-131-2/+1
|/ /
* | Changes needed to roll Skia to r7527.Derek Sollenberger2013-02-041-1/+1
* | am 7cd0859a: Merge "Update framework text layout to use Harfbuzz NG"Raph Levien2013-01-151-4/+3
|\ \
| * | Update framework text layout to use Harfbuzz NGRaph Levien2013-01-151-4/+3
generated by cgit v1.1 at 2025-03-31 13:48:10 +0000