Commit Graph

8277 Commits

Author SHA1 Message Date
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
Kenny Root
c8c211a085 Fix some errors in the foreground compat
The foreground compatibility sample wouldn't actually work on an old
platform because of a misplaced return statement in onCreate and the
invokeMethod would ignore its arguments.

Change-Id: Ic1d1a6d8579700215c7988cd603a6bb86f1346a4
2011-03-29 09:51:21 -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
The Android Automerger
6f720e59b3 merge in gingerbread-release history after reset to gingerbread 2011-03-28 16:31:04 -07:00
Xavier Ducrohet
e5a81ca2f5 am f19518fc: am 9775ffe5: Merge "Update SDK files to API 12/Android 3.1" into honeycomb-mr1
* commit 'f19518fcb1ef26db56094cfaaf9d8082ad30f316':
  Update SDK files to API 12/Android 3.1
2011-03-28 16:03:32 -07: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
Raphael
923dc04127 am e2d5577e: (-s ours) am 4cc9a1e9: Merge 48023786cf: \'Generate SDK Repository XML.\' Do not merge.
* commit 'e2d5577e86390ee769bb417a5e09133e7d133ae6':
  Merge 48023786cf: 'Generate SDK Repository XML.' Do not merge.
2011-03-28 12:57:56 -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
Jacky Romano
2d824c62e7 Android emulator opengl - unit testing render control api
This adds minimal rendering control api codec that is used by opengl codec
unit tests. The api is used to pass messages regarding resource creation
(surfaces, opengl context) and swapbuffers notifications.
The actual encoder and decoder code is generated using 'emugen'

Change-Id: Ia9b74ae755d032a9b02fdc5f85575d4cd8ada326
2011-03-28 19:08:40 +02:00
Jacky Romano
f92438f64c Android emulator opengl - OpenGL ES 1.1 decoder
This change adds the opengl host side decoder library (libGLESv1_dec)
The library uses the GLESv1 api defintion (part of libGLESv1_enc library)
used by emugen to generate the library code. It also includes
The generated code is wrapped with the GLDecoder class to handle OpenGL
specific semantics

Change-Id: I0948f1984e538d8f6cfedc961e6296686b4be850
2011-03-28 19:08:20 +02:00
Jacky Romano
6a04b8afc5 Emulator opengl - Opengl ES 1.1 encoder
This change the opengl target side encoder library (libGLESv1_enc)
The library includes api definition files for 'emugen' code generation
tool and a serrounding code to handle opengl specific sematics (such as client state)
tracking

Change-Id: I8708b945c8c9c7fbe06147b703bdee27a576c7a0
2011-03-28 19:06:03 +02:00
Jacky Romano
c27986a3c2 Opengl implementation - codec common code
This change adds the libOpenglCodecCommon, which holds
shared code between the encoder and the decoder parts of the opengl
codec. The library is built as static with both a target version and
a host version.

Change-Id: I163eea8fdb635620e6cde9d1d75c3e7369953213
2011-03-28 19:01:49 +02:00
David Turner
201398b489 am 85d6342d: am 99d6295f: Merge "Enable lcd backlight in the emulator."
* commit '85d6342d8b5e76f933a200c8a9832a52b69d9548':
  Enable lcd backlight in the emulator.
2011-03-28 07:41:20 -07:00
David Turner
85d6342d8b am 99d6295f: Merge "Enable lcd backlight in the emulator."
* commit '99d6295f69532f24371a40c27671ac6cbc6b1ded':
  Enable lcd backlight in the emulator.
2011-03-28 07:28:07 -07:00
David Turner
99d6295f69 Merge "Enable lcd backlight in the emulator." 2011-03-28 07:04:33 -07:00
The Android Automerger
abfaee252f merge in gingerbread-release history after reset to gingerbread 2011-03-28 05:43:42 -07:00
The Android Automerger
9041c6260a merge in gingerbread-release history after reset to gingerbread 2011-03-25 22:25:29 -07:00
Raphael
06f2189a4e am 627afeae: resolved conflicts for merge of 002acfc3 to stage-korg-master
* commit '627afeae86cf877b53316d976f53c3735414f3ca':
  Fix XMLNS detection in SDK Repo XSD files.
2011-03-25 17:51:57 -07:00
Raphael
31d15b9f76 Merge 48023786cf: 'Generate SDK Repository XML.' Do not merge.
When the "sdk_repo" modified is used during the SDK build,
this also generates the repository.xml and addon.xml files
for the new SDK repository packages and places them in
the DIST_DIR.

Example usage:
  make -j 16 PRODUCT-sdk-sdk showcommands sdk_repo dist DIST_DIR=/dist/sdk
  make -j 16 PRODUCT-google_sdk-sdk_addon showcommands sdk_repo dist DIST_DIR=/dist/addon

Also merges 3ea87ca65f
  'Fix XMLNS detection in SDK Repo XSD files.'
  to prevent a merge conflict later on.

Change-Id: Ib14fe820dab7a60bb5412968c146c30ec5ba81c7
2011-03-25 17:50:38 -07:00
Raphael
4cc9a1e942 Merge 48023786cf: 'Generate SDK Repository XML.' Do not merge.
When the "sdk_repo" modified is used during the SDK build,
this also generates the repository.xml and addon.xml files
for the new SDK repository packages and places them in
the DIST_DIR.

Example usage:
  make -j 16 PRODUCT-sdk-sdk showcommands sdk_repo dist DIST_DIR=/dist/sdk
  make -j 16 PRODUCT-google_sdk-sdk_addon showcommands sdk_repo dist DIST_DIR=/dist/addon

Also merges 3ea87ca65f
  'Fix XMLNS detection in SDK Repo XSD files.'
  to prevent a merge conflict later on.

Change-Id: Ic9832e71456d76f849406e641792f4285ffbf649
2011-03-25 17:45:21 -07:00
Raphael
627afeae86 resolved conflicts for merge of 002acfc3 to stage-korg-master
Change-Id: I58e9828bd4d3ebcc4099c9f9ab97390023a1b8e8
2011-03-25 17:38:23 -07:00