Commit Graph

8183 Commits

Author SHA1 Message Date
Raphael
895bfe6922 am 7c0bb37c: (-s ours) am 5dc10d55: (-s ours) Specify the full path to atree for the windows.atree. DO NOT MERGE.
* commit '7c0bb37c6a270536e0a04dfd728dd93ec0d42805':
  Specify the full path to atree for the windows.atree. DO NOT MERGE.
2011-09-19 15:51:38 -07:00
Xavier Ducrohet
e8df71052a am fbd21dc2: (-s ours) am 405c0940: (-s ours) Rename Compatibility into support and move it to rev 4. DO NOT MERGE.
* commit 'fbd21dc20360258af633ed9b8776ae3cc6b06457':
  Rename Compatibility into support and move it to rev 4. DO NOT MERGE.
2011-09-19 15:51:36 -07:00
Raphael
f2f0e6dfe5 am 743d309c: (-s ours) am bc162207: (-s ours) Use atree for the Windows SDK. Strip binaries. DO NOT MERGE.
* commit '743d309ce03e8c5104ad6166bd73c806cfa6d577':
  Use atree for the Windows SDK. Strip binaries. DO NOT MERGE.
2011-09-19 15:51:34 -07:00
Xavier Ducrohet
8d169d4093 am 6eb6ee71: (-s ours) am dda48a45: (-s ours) Move sdk components to API 14. DO NOT MERGE.
* commit '6eb6ee71ac52273f8cc1917a1d96bd90df77d02a':
  Move sdk components to API 14. DO NOT MERGE.
2011-09-19 15:51:32 -07:00
Xavier Ducrohet
a75e04eac8 am 16d37746: (-s ours) am ca4d7f2f: (-s ours) Remove llvm/api file matching. DO NOT MERGE
* commit '16d37746c7e7d1c9bd3cdcb2e428cd1fed8be061':
  Remove llvm/api file matching. DO NOT MERGE
2011-09-19 15:51:29 -07:00
Raphael
7c0bb37c6a am 5dc10d55: (-s ours) Specify the full path to atree for the windows.atree. DO NOT MERGE.
* commit '5dc10d55a4af3008f820388b9ce775a7e8205a09':
  Specify the full path to atree for the windows.atree. DO NOT MERGE.
2011-09-19 15:49:27 -07:00
Xavier Ducrohet
fbd21dc203 am 405c0940: (-s ours) Rename Compatibility into support and move it to rev 4. DO NOT MERGE.
* commit '405c094032146ab589818e66764db4a90511ba05':
  Rename Compatibility into support and move it to rev 4. DO NOT MERGE.
2011-09-19 15:49:05 -07:00
Raphael
743d309ce0 am bc162207: (-s ours) Use atree for the Windows SDK. Strip binaries. DO NOT MERGE.
* commit 'bc162207564c655fbd78a9cbaf933c62efee16b8':
  Use atree for the Windows SDK. Strip binaries. DO NOT MERGE.
2011-09-19 15:49:03 -07:00
Xavier Ducrohet
6eb6ee71ac am dda48a45: (-s ours) Move sdk components to API 14. DO NOT MERGE.
* commit 'dda48a45e0ced88c478c0d3c0becdd29458f555f':
  Move sdk components to API 14. DO NOT MERGE.
2011-09-19 15:49:00 -07:00
Xavier Ducrohet
16d37746c7 am ca4d7f2f: (-s ours) Remove llvm/api file matching. DO NOT MERGE
* commit 'ca4d7f2f74100e6bee906efe563efb65545187e5':
  Remove llvm/api file matching. DO NOT MERGE
2011-09-19 15:48:57 -07:00
Raphael Moll
3acd4823bb SDK: use XSD v5 props when generating repository packages.
This requires sdk.git Change-Id I6993d6c4 to build
(to enable the use of XSD v5).

Change-Id: If3beb09ae4eef3990caf661b2d4cfbdfd8a6f86a
2011-09-17 22:50:43 -07:00
Raphael Moll
ec48ca3dff Win SDK: fix missing platforms-tools/dx.bat
In the new windows.atree, the batch file was missing the .bat extension.
This prevents the SDK Manager from recognizing platform-tools.

Change-Id: I885b748f9ce7f6ceeb9f7b9c35ca38f7b8029f55
2011-09-17 21:52:14 -07:00
Vladimir Chtchetkine
4bc3b1f3b5 Hookup to cmdline parameters in emulator
Use boot properties, and webcam facing parameters set up by the emulator's cmdline.

Change-Id: I2189e5f67b9d79ad330b5ee275ff30d8851fc326
2011-09-17 11:28:09 -07:00
Raphael
5dc10d55a4 Specify the full path to atree for the windows.atree. DO NOT MERGE.
Somehow the build server doesn't automatically find atree.
In a future CL this should be amended to pass the proper
OUT_HOST_EXECUTABLE, being careful that it points to the
host/linux dir, not the current Windows one.

Cherry-pick from master b2b5921

Change-Id: I13e532cdc4c0839b6fd7f2a3a149725940a02734
2011-09-16 21:38:13 -07:00
Xavier Ducrohet
405c094032 Rename Compatibility into support and move it to rev 4. DO NOT MERGE.
Cherry-pick from master e98f22d

Change-Id: I165a7aeb429a4288d6f693a7613a4a102e21dd5b
2011-09-16 21:38:08 -07:00
Raphael
bc16220756 Use atree for the Windows SDK. Strip binaries. DO NOT MERGE.
This moves the copy/strip/rm logic for the Windows SDK
from the patch_windows_sdk.sh to a regular sdk-windows-x86.atree.

The bash script is still here to invoke atree and do whatever
cleanup we might want to do later.

This should make it easier to maintain the Windows SDK
by providing a structure similar to tools.atree.

This change requires build.git Change-Id: I22aae7a8 to
have rm/strip support in atree.

Cherry-pick from master e07f59a

Change-Id: Ia71fc69717eaee6e4d8d062144347db3326e4127
2011-09-16 21:38:03 -07:00
Xavier Ducrohet
dda48a45e0 Move sdk components to API 14. DO NOT MERGE.
Cherry-pick from master 71be098

Change-Id: I9dc0245fdd19660a4b08d454892df02a02810749
2011-09-16 21:37:54 -07:00
Xavier Ducrohet
ca4d7f2f74 Remove llvm/api file matching. DO NOT MERGE
We are moving to a single llvm executable able to handle all
API levels so this file (helping select the llvm exe depending
on target API is not needed anymore).

Cherry-pick from master 73aa4b5

Change-Id: Icc9b035740679eacfa59d452f71e71355816f7be
2011-09-16 21:37:49 -07:00
Eric Fischer
6816177441 am d392797e: (-s ours) am 43249f5d: (-s ours) Import revised translations. DO NOT MERGE
* commit 'd392797ecfc5221e272e7d91767cef72f5dcc89e':
  Import revised translations.  DO NOT MERGE
2011-09-16 16:21:40 -07:00
Eric Fischer
d392797ecf am 43249f5d: (-s ours) Import revised translations. DO NOT MERGE
* commit '43249f5d3c8a5938d6ffd7018e382a1c76b04128':
  Import revised translations.  DO NOT MERGE
2011-09-16 16:19:17 -07:00
Raphael
3473f6b295 Merge "Specify the full path to atree for the windows.atree" 2011-09-16 15:53:10 -07:00
Raphael
b2b5921d1b Specify the full path to atree for the windows.atree
Somehow the build server doesn't automatically find atree.
In a future CL this should be amended to pass the proper
OUT_HOST_EXECUTABLE, being careful that it points to the
host/linux dir, not the current Windows one.

Change-Id: I53379dedc34fcce83773178add0ebadfcdc04b01
2011-09-16 15:30:27 -07:00
Eric Fischer
43249f5d3c Import revised translations. DO NOT MERGE
Change-Id: I1d7e1bebe296c4b32e90f2a9e04cea263e53674d
2011-09-16 15:15:25 -07:00
Xavier Ducrohet
e98f22dba3 Rename Compatibility into support and move it to rev 4.
Change-Id: I16ef0d75760c3605458188a201134bd96983e487
2011-09-16 12:39:58 -07:00
Raphael
e07f59a612 Use atree for the Windows SDK. Strip binaries.
This moves the copy/strip/rm logic for the Windows SDK
from the patch_windows_sdk.sh to a regular sdk-windows-x86.atree.

The bash script is still here to invoke atree and do whatever
cleanup we might want to do later.

This should make it easier to maintain the Windows SDK
by providing a structure similar to tools.atree.

This change requires build.git Change-Id: I22aae7a8 to
have rm/strip support in atree.

Change-Id: If937eef4a819e7da21aa993459111fc5d99474a8
2011-09-16 11:05:11 -07:00
Xavier Ducrohet
3eed420c81 Merge "Remove llvm/api file matching." 2011-09-16 10:39:31 -07:00
Xavier Ducrohet
dca63be116 Merge "Move sdk components to API 14." 2011-09-16 10:39:08 -07:00
Xavier Ducrohet
71be098e55 Move sdk components to API 14.
Change-Id: Ib56dce765dca77d8f6a69b962f7897d8eadec373
2011-09-16 10:38:37 -07:00
Vladimir Chtchetkine
95e167dc3c Merge "Implement "takePicture"" 2011-09-16 06:07:07 -07:00
Vladimir Chtchetkine
2a532ee388 Implement "takePicture"
With this CL the camera emulator is capable of taking pictures

Change-Id: I29feea0c75a78c619aaf854a5665a24afb507ba4
2011-09-15 18:24:32 -07:00
Xavier Ducrohet
73aa4b5122 Remove llvm/api file matching.
We are moving to a single llvm executable able to handle all
API levels so this file (helping select the llvm exe depending
on target API is not needed anymore).

Change-Id: Iea7b59de182ceb4e5f8a9ba9fe712d47834d39e0
2011-09-15 17:53:07 -07:00
Vladimir Chtchetkine
d9d6c74b45 Merge "Separate actual camera device start and frame delivery" 2011-09-15 05:58:18 -07:00
David 'Digit' Turner
b13cf4ac31 emulator: opengl: Fix the Windows SDK build
Change-Id: I97be6f81af321f75ff5d43b258387fdc039f0210
2011-09-15 12:14:31 +02:00
Svetoslav Ganov
1a4cc125d1 Update API demos to show ActionProvider demo for at least ICS
bug:5033542

Change-Id: Icea34fb21e04ee7c40ccca6894d9a24544d6c816
2011-09-14 19:42:45 -07:00
Vladimir Chtchetkine
49842cee05 Separate actual camera device start and frame delivery
These two tasks (starting the camera device, and starting working thread that pulls frames
from the started camera device) should be clearly separated, and should not be combined in
one method (as it was with the 'startCapturing' method).

Change-Id: I779bee924d99d9a87257c6b76791545b76795e72
2011-09-14 18:35:48 -07:00
Vladimir Chtchetkine
f48f6f359d Merge "Fix locking issues in the callback notifier" 2011-09-14 14:50:24 -07:00
Vladimir Chtchetkine
ba78a2f1d3 Fix locking issues in the callback notifier
Holding an object lock while macking the callbacks cause deadlocks
due to reentrance to the callabck notifier.

Change-Id: I5f2780989798ebf5c5d7aab34ac233bb5952079d
2011-09-14 14:24:03 -07:00
Scott Main
d21f82d678 Merge "rewrite HC Gallery app to support phones. In summary, this change:" 2011-09-14 14:14:09 -07:00
Vladimir Chtchetkine
4756fada1a Fix typos introduced during style adjustment
Change-Id: Ia9ca4849d4a410aea9d49d2c6246d36c4c7fc8f1
2011-09-14 13:56:48 -07:00
Vladimir Chtchetkine
4d47360672 Fix capture stopping
When stopping the camera, the working thread should be stopped before sending
"stop" query to the emulator: we don't want "frame" queries to be floating around
while we're in the process of stopping the camera.

Change-Id: I16dc56ca1c2e304a07a074302001d2e27100f2ac
2011-09-14 07:06:23 -07:00
Vladimir Chtchetkine
16232484c7 Fix build
Change-Id: Ifb5dd0b11bd616ef5a5a1e79b510b00f1d55672a
2011-09-13 16:02:51 -07:00
Vladimir Chtchetkine
5467be2eef Refactored emulated camera HAL to comply with code style
Change-Id: If57b536ae6b1f9bad4213630488591a3b3cc9fdd
2011-09-13 14:35:25 -07:00
Vladimir Chtchetkine
492332c295 Merge "Implements connection with the emulator" 2011-09-13 09:45:09 -07:00
Vladimir Chtchetkine
33bda47528 Implements connection with the emulator
Change-Id: Ie3910a98e927f7b8ea556c403f8ced27e06bcdec
2011-09-13 09:44:32 -07:00
David 'Digit' Turner
0db6e8dd27 Merge "emulator: opengl: Support named pipes on Win32" 2011-09-13 07:32:29 -07:00
David 'Digit' Turner
b065016640 Merge "emulator: opengl: Add support for unix sockets." 2011-09-13 07:02:38 -07:00
David 'Digit' Turner
bde30e7480 Merge "emulator: opengl: re-enable gralloc builds" 2011-09-13 06:20:29 -07:00
David 'Digit' Turner
3abd13d4d6 emulator: opengl: Support named pipes on Win32
This patch adds support for Win32 named pipes for the communication
channel between the Opengl renderer library and its clients.

Named pipes should be much faster than local TCP sockets on this
platform. Note that by default, TCP sockets are still used. The
emulator needs to call setStreamMode(STREAM_MODE_PIPE) to be able
to use these.

Change-Id: I86d36624cf2b7fdd50f41e1e43c908348dca4657
2011-09-13 14:04:49 +02:00
David 'Digit' Turner
3d76ec1e3c emulator: opengl: Add support for unix sockets.
This patch allows the OpenGLES rendering library to use Unix
sockets instead of TCP ones when communicating with its clients.
On certain benchmarks (e.g. 0xBench teapot), this provides a
noticeable improvement (x1.05 fps) without any other changes.

On practice, Unix sockets are faster than TCP sockets, even
local ones. Also, this introduces a moderate amount of
abstraction that will allow us to use Win32 named pipes
on Windows (where TCP sockets are much slower than they
are on Unix).

Note that by default, TCP streams are still used.
The client (emulator) must call the new API 'setStreamMode'
to change it to STREAM_MODE_UNIX between 'initLibrary' and
'startOpenglRenderer' calls.

+ Adjust callers / user appropriately.

Change-Id: I4105bbf07541f3146b50a58d1a5b51e8cf044fab
2011-09-13 14:03:32 +02:00
David 'Digit' Turner
3598af3850 emulator: opengl: add missing pthread_mutex_destroy
Change-Id: Ib6be00619e06f5ff492a080d1feb2954b626fa26
2011-09-13 14:02:37 +02:00