Raphael
19f0482e71
am d739e3ab: (-s ours) am 922ee89a: Merge 2ff496b8a1: \'Build SDK repository.\' Do not merge.
...
* commit 'd739e3ab11047cefab4b3a9ea161ee3ba58952f4':
Merge 2ff496b8a1 : 'Build SDK repository.' Do not merge.
2011-03-31 16:41:41 -07:00
Raphael
d739e3ab11
am 922ee89a: Merge 2ff496b8a1: \'Build SDK repository.\' Do not merge.
...
* commit '922ee89a69da7c3007b48977835e9736766b4ba2':
Merge 2ff496b8a1 : 'Build SDK repository.' Do not merge.
2011-03-31 16:34:18 -07:00
Jean-Baptiste Queru
4f1e514c19
am 02fe35d6: am c969a03b: merge from open-source master
...
* commit '02fe35d64f2eb11b6ce8afd046a4d37ee227d1a9':
Fix device builds
2011-03-31 09:48:44 -07:00
Jean-Baptiste Queru
02fe35d64f
am c969a03b: merge from open-source master
...
* commit 'c969a03b5e5f6754adf45edd98ed1a10c42bf641':
Fix device builds
2011-03-31 09:23:33 -07:00
Jean-Baptiste Queru
c969a03b5e
merge from open-source master
...
Change-Id: I1f2a4650c696c6a58d59b8fd6e96dc3a372ff095
2011-03-31 09:19:11 -07:00
David 'Digit' Turner
a8725e817a
Merge "Fix device builds"
2011-03-31 08:33:40 -07:00
David 'Digit' Turner
e97b54b648
Fix device builds
...
This patch ensures that the egl.cfg file specific to our
hardware OpenGL emulation is only copied to the system images
of emulator-specific build products.
This fixes a conflict for device-specific products (which provide
their own hw-specific egl.cfg).
Change-Id: I30cd64ba5915e5ffdc1091de8db20f6c3c671486
2011-03-31 09:39:59 +02:00
Winson Chung
6c6639d1e2
am b02ad50d: Making the sample weather widget vertically resizeable.
...
* commit 'b02ad50d1a83f7171aaa1c1d17716ed5699dec40':
Making the sample weather widget vertically resizeable.
2011-03-30 09:37:06 -07:00
David 'Digit' Turner
e61f64b332
am 7b14e7c0: am a5d35801: am 50dd0170: Merge "Fix linux sdk build."
...
* commit '7b14e7c051eabf2f9b3e2f8035d8330a4924d930':
Fix linux sdk build.
2011-03-30 08:21:25 -07:00
David Turner
720ec5efca
am ee8e31ad: am 02c8a712: am 4bda89b6: Merge changes I6379d6b1,I77794044
...
* commit 'ee8e31ad5229634770ecd6eb5c3a52ff03284c17':
Android emulator opengl - host side EGL wrapper
Android emulator opengl - unit test host side renderer
2011-03-30 08:21:20 -07:00
David Turner
5a1237f519
am 420e1b0d: am d5df4a71: am 485970b9: Merge "Android emulator opengles - unit test gles wrapper"
...
* commit '420e1b0dd42e645bf1b928f3fb9d13a0560e366f':
Android emulator opengles - unit test gles wrapper
2011-03-30 08:21:15 -07:00
David Turner
af2d828a8b
am 98c75d03: am 0aa24748: am 3f22fdc0: Merge "Android emulator opengl - unit testing render control api"
...
* commit '98c75d03495e55c756db5d76218467f355eb8193':
Android emulator opengl - unit testing render control api
2011-03-30 08:21:13 -07:00
David Turner
61dd0b8251
am e347712d: am 06bf2701: am 02ef4e99: Merge "Android emulator opengl - OpenGL ES 1.1 decoder"
...
* commit 'e347712dace1e1924e319bc4a6a89796dd7a4cb2':
Android emulator opengl - OpenGL ES 1.1 decoder
2011-03-30 08:21:10 -07:00
David Turner
a3137783dc
am 2e5f0d15: am 8a882514: am 39c9911c: Merge "Emulator opengl - Opengl ES 1.1 encoder"
...
* commit '2e5f0d15fbb875e67845503427a8ee204261ca5b':
Emulator opengl - Opengl ES 1.1 encoder
2011-03-30 08:21:07 -07:00
David Turner
e9f8263d2a
am 483ff042: am 687d8b76: am 98015723: Merge "Opengl implementation - codec common code"
...
* commit '483ff04245c6f6739663fa9357f75d6900bc5259':
Opengl implementation - codec common code
2011-03-30 08:21:04 -07:00
David Turner
d56f61b3fd
am 201398b4: am 85d6342d: am 99d6295f: Merge "Enable lcd backlight in the emulator."
...
* commit '201398b4890f37e2a0db4ef33dfc2140506a4957':
Enable lcd backlight in the emulator.
2011-03-30 08:20:36 -07:00
Raphael
ee13f1c3a7
am 06f2189a: am 627afeae: resolved conflicts for merge of 002acfc3 to stage-korg-master
...
* commit '06f2189a4eb7221ae5ef0eda451f4f7875b906b5':
Fix XMLNS detection in SDK Repo XSD files.
2011-03-30 08:20:33 -07:00
David 'Digit' Turner
74a30541a4
am 1ca79b34: am 8edebe1f: am 4712e4eb: Merge "qemud: disable debug traces"
...
* commit '1ca79b3497eb4ca3f7341dcb97bb263d8fa6245b':
qemud: disable debug traces
2011-03-30 08:20:18 -07:00
Raphael
89c0b1a34e
am 7a8e0399: (-s ours) am 86f738ab: am 473fad03: (-s ours) Merge "Merge 48023786cf: \'Generate SDK Repository XML.\' Do not merge."
...
* commit '7a8e0399c6b8b0b02cd596d0949acc8364500887':
Merge 48023786cf : 'Generate SDK Repository XML.' Do not merge.
2011-03-30 08:20:01 -07:00
Raphael
84ed11075e
am 8ad74177: (-s ours) am 2a610080: am 878796e9: (-s ours) Merge "Merge 2ff496b8a1: \'Build SDK repository.\' Do not merge."
...
* commit '8ad7417748be9a2a1456f55d1e5e4c6484c06f93':
Merge 2ff496b8a1 : 'Build SDK repository.' Do not merge.
2011-03-30 08:19:56 -07:00
David 'Digit' Turner
7b14e7c051
am a5d35801: am 50dd0170: Merge "Fix linux sdk build."
...
* commit 'a5d358011e16abdc29ac600a40d96e5b5d59cd7a':
Fix linux sdk build.
2011-03-29 09:57:16 -07:00
David 'Digit' Turner
a5d358011e
am 50dd0170: Merge "Fix linux sdk build."
...
* commit '50dd0170660e4ef98ec3eb470eb6ce053d2b9825':
Fix linux sdk build.
2011-03-29 09:55:00 -07:00
David 'Digit' Turner
50dd017066
Merge "Fix linux sdk build."
2011-03-29 09:39:59 -07:00
David 'Digit' Turner
db35d9a010
Fix linux sdk build.
...
This is a temporary patch until we update the prebuilt/ tree accordingly
to include libxcb.so for Linux.
Change-Id: I76d9966bfb73bf3f5ca35cc30f6e12fb262dc2b2
2011-03-29 18:37:37 +02:00
Xavier Ducrohet
f19518fcb1
am 9775ffe5: Merge "Update SDK files to API 12/Android 3.1" into honeycomb-mr1
...
* commit '9775ffe5fd3b8498137edf59c7570c4639a73763':
Update SDK files to API 12/Android 3.1
2011-03-28 15:58:37 -07:00
Winson Chung
b02ad50d1a
Making the sample weather widget vertically resizeable.
...
Change-Id: I0301004a703b501cf135e0750512ad9070aff59c
2011-03-28 15:46:29 -07:00
Xavier Ducrohet
9775ffe5fd
Merge "Update SDK files to API 12/Android 3.1" into honeycomb-mr1
2011-03-28 15:27:26 -07:00
Xavier Ducrohet
a6f8392dc7
Update SDK files to API 12/Android 3.1
...
Change-Id: I630413dab4f6859623a9c1aa44b54abe6ef392b8
2011-03-28 15:23:37 -07:00
David Turner
ee8e31ad52
am 02c8a712: am 4bda89b6: Merge changes I6379d6b1,I77794044
...
* commit '02c8a7121ff33b44dc7d7581eb67faae59ee3d2c':
Android emulator opengl - host side EGL wrapper
Android emulator opengl - unit test host side renderer
2011-03-28 13:16:42 -07:00
David Turner
420e1b0dd4
am d5df4a71: am 485970b9: Merge "Android emulator opengles - unit test gles wrapper"
...
* commit 'd5df4a71c659f6ca450be596dda87150dd44b6a3':
Android emulator opengles - unit test gles wrapper
2011-03-28 13:16:40 -07:00
David Turner
98c75d0349
am 0aa24748: am 3f22fdc0: Merge "Android emulator opengl - unit testing render control api"
...
* commit '0aa24748348e5e830f0a069b5f44d90444ce1709':
Android emulator opengl - unit testing render control api
2011-03-28 13:16:38 -07:00
David Turner
e347712dac
am 06bf2701: am 02ef4e99: Merge "Android emulator opengl - OpenGL ES 1.1 decoder"
...
* commit '06bf2701348c253876876bcba1229fa3afe85658':
Android emulator opengl - OpenGL ES 1.1 decoder
2011-03-28 13:16:36 -07:00
David Turner
02c8a7121f
am 4bda89b6: Merge changes I6379d6b1,I77794044
...
* commit '4bda89b6df7f31e9ea80e40e1aa23b6a80eafdd5':
Android emulator opengl - host side EGL wrapper
Android emulator opengl - unit test host side renderer
2011-03-28 13:14:41 -07:00
David Turner
d5df4a71c6
am 485970b9: Merge "Android emulator opengles - unit test gles wrapper"
...
* commit '485970b99f550602e0296658ea15849a2e857d96':
Android emulator opengles - unit test gles wrapper
2011-03-28 13:14:39 -07:00
David Turner
0aa2474834
am 3f22fdc0: Merge "Android emulator opengl - unit testing render control api"
...
* commit '3f22fdc0faeb35ad6b7476f87938e7b2554a2255':
Android emulator opengl - unit testing render control api
2011-03-28 13:14:37 -07:00
David Turner
06bf270134
am 02ef4e99: Merge "Android emulator opengl - OpenGL ES 1.1 decoder"
...
* commit '02ef4e99572bd67d83332168f355c49bb6d4aba7':
Android emulator opengl - OpenGL ES 1.1 decoder
2011-03-28 13:14:35 -07:00
David Turner
4bda89b6df
Merge changes I6379d6b1,I77794044
...
* changes:
Android emulator opengl - host side EGL wrapper
Android emulator opengl - unit test host side renderer
2011-03-28 13:12:14 -07:00
David Turner
2e5f0d15fb
am 8a882514: am 39c9911c: Merge "Emulator opengl - Opengl ES 1.1 encoder"
...
* commit '8a8825144a518296afa33a1e41295bad729d3431':
Emulator opengl - Opengl ES 1.1 encoder
2011-03-28 13:08:43 -07:00
David Turner
483ff04245
am 687d8b76: am 98015723: Merge "Opengl implementation - codec common code"
...
* commit '687d8b7629f67cfe4916b12550d91685ec7113b2':
Opengl implementation - codec common code
2011-03-28 13:08:41 -07:00
David Turner
485970b99f
Merge "Android emulator opengles - unit test gles wrapper"
2011-03-28 13:04:52 -07:00
David Turner
8a8825144a
am 39c9911c: Merge "Emulator opengl - Opengl ES 1.1 encoder"
...
* commit '39c9911c9d786b39e4bf7bd47b57db43e6c8e249':
Emulator opengl - Opengl ES 1.1 encoder
2011-03-28 13:04:39 -07:00
David Turner
687d8b7629
am 98015723: Merge "Opengl implementation - codec common code"
...
* commit '980157234c3074cd6504e198a2b06c844b4c9027':
Opengl implementation - codec common code
2011-03-28 13:04:36 -07:00
David Turner
3f22fdc0fa
Merge "Android emulator opengl - unit testing render control api"
2011-03-28 13:01:00 -07:00
David Turner
02ef4e9957
Merge "Android emulator opengl - OpenGL ES 1.1 decoder"
2011-03-28 12:59:55 -07:00
David Turner
39c9911c9d
Merge "Emulator opengl - Opengl ES 1.1 encoder"
2011-03-28 12:57:14 -07:00
Raphael
e2d5577e86
am 4cc9a1e9: Merge 48023786cf: \'Generate SDK Repository XML.\' Do not merge.
...
* commit '4cc9a1e942f068c86b0715e398ec40f86a9deb87':
Merge 48023786cf : 'Generate SDK Repository XML.' Do not merge.
2011-03-28 12:56:11 -07:00
David Turner
980157234c
Merge "Opengl implementation - codec common code"
2011-03-28 12:50:36 -07:00
Jacky Romano
f99884f916
Android emulator opengl - host side EGL wrapper
...
This adds an EGL wrapper used by the test rendering to load an EGL
implementation that matches the OpenGL ES impelmentation that it uses.
The library is a simple wrapper that direct EGL calls through a dispatch
table that is dynamically loaded from an EGL shared library implementation
Change-Id: I6379d6b156c69f9e017da0039c96699290f0f84f
2011-03-28 19:22:31 +02:00
Jacky Romano
faa8994f17
Android emulator opengl - unit test host side renderer
...
This adds 'ut_renderer' - a host side unit test renderer. ut_renderer is used to
take a command stream over a socket connection and render it into an opengl window.
The renderer uses the GLESv1_dec decoder library and the ut_rendercontrol api to parse
the command stream.
The ut_renderer uses an external (plug-in) opengl impelementation.
Change-Id: I77794044ca9ca8a75a66a95a248eac384710aafe
2011-03-28 19:20:23 +02:00
Jacky Romano
a4205ba264
Android emulator opengles - unit test gles wrapper
...
This adds opengl es implementation driver that selects whether to use
the native android emulator opengl impelementation or use a remote,
host side renderer. This driver is used to selectivley run applications using
the remote renderer. The selection is based on the application/process name and
is configured using /etc/gles_emul.cfg in the emulator side.
This change also installs /etc/egl.cfg that is used by the Android opengl wrapper
to select an opengl implementation
Change-Id: I66eda3d48938f8057bf45e6476b7faefaf1130fb
2011-03-28 19:18:27 +02:00