Commit Graph

6884 Commits

Author SHA1 Message Date
David 'Digit' Turner
5ac5b707bb am b257bb8a: am e9c7386b: am e011bed4: Merge "ndk: x86: Sanitize platform headers and libraries."
* commit 'b257bb8ab4a18e6683aec64389305e179f6eb86b':
  ndk: x86: Sanitize platform headers and libraries.
2011-06-07 17:16:35 -07:00
David Turner
58c9ec5af9 am 1ccce78e: am e490d50e: am 8c7d5519: Merge "opengl translator: make GLcommon static library"
* commit '1ccce78ed693b7e796289e388bab2d6e200bcbdb':
  opengl translator: make GLcommon static library
2011-06-07 15:13:35 -07:00
David Turner
0e4f562092 am f61e7a3c: am 94f566f8: am cc3b3887: Merge "opengl translator: moved some types out of eglplatform.h"
* commit 'f61e7a3c985e8883efa6de35d9fec877be9f51fe':
  opengl translator: moved some types out of eglplatform.h
2011-06-07 15:13:33 -07:00
David Turner
8d6b45e860 am ee00d4b4: am 7870c9f5: am 8a96cb7e: Merge "opengl translator: initialize dispatch with dummy functions"
* commit 'ee00d4b4138a2f3c2b4049289564724194fb9450':
  opengl translator: initialize dispatch with dummy functions
2011-06-07 15:13:30 -07:00
Brett Chabot
97748e0099 Merge "Make runtest reboot and root more robust." 2011-06-07 15:13:20 -07:00
Ying Wang
534f6c2de5 am 514c8cb5: am e4ccbd68: Use a function to package android support libraries.
* commit '514c8cb5f622eaa389a7b50a69582ebf9e6c5d21':
  Use a function to package android support libraries.
2011-06-07 14:02:13 -07:00
Ying Wang
514c8cb5f6 am e4ccbd68: Use a function to package android support libraries.
* commit 'e4ccbd68ec540739819bea7e109d29d08a54122a':
  Use a function to package android support libraries.
2011-06-07 13:59:27 -07:00
David Turner
b6b866c5a9 am 638e7d8b: am 5f82c3ab: am a1b9f9bc: Merge "implementing mac OS support for translator\'s libs"
* commit '638e7d8bd223772317b9939cbf84516cdd88a5f5':
  implementing mac OS support for translator's libs
2011-06-07 13:25:16 -07:00
David Turner
1a77f754d1 am 2e8d5e1d: am 4de570c9: am f3c023e4: Merge "opengl translator: GLSL ES translation"
* commit '2e8d5e1dabd51a147317c01ad894591465fe45a0':
  opengl translator: GLSL ES translation
2011-06-07 13:25:07 -07:00
David Turner
a3d243e00f am 9178b80c: am eae0aff8: am 87043c4e: Merge "opengl translator: added EGL_RENDERABLE_TYPE attrib"
* commit '9178b80ce4951119f8ecac7a595e0d2a1b4abdb9':
  opengl translator: added EGL_RENDERABLE_TYPE attrib
2011-06-07 13:24:59 -07:00
David Turner
3d03d4854b am e3ca49a9: am 3b987d0c: am a2c959d5: Merge "fixes for gles2 tests"
* commit 'e3ca49a9495e5cd36b5cd3bcd163e11758a4e4cf':
  fixes for gles2 tests
2011-06-07 13:24:54 -07:00
David Turner
8c5259cd48 am 3ba3156e: am a68506a3: am bcec626f: Merge "add gles2 extensions"
* commit '3ba3156e134953a88648ab8a732b291651eaafa4':
  add gles2 extensions
2011-06-07 13:24:51 -07:00
David Turner
f19483e535 am 1251787f: am 5af3c174: am 4bf1d504: Merge "implement GL_OES_draw_texture"
* commit '1251787f846dd73ff1cc739064947586a98f301f':
  implement GL_OES_draw_texture
2011-06-07 13:24:47 -07:00
David Turner
d07b6c87fe am e1beb756: am f26f4dd7: am ffe663de: Merge "Add gles 1 extension implementation to translator"
* commit 'e1beb756312c647b938b875f28177ec87c5c99f2':
  Add gles 1 extension implementation to translator
2011-06-07 13:24:42 -07:00
David Turner
c89cd7afa4 am 0777f78e: am a2e0e64a: am 61287c50: Merge "removed old/obsolete file GLEScontext.cpp"
* commit '0777f78ee81b4089f88290af82db2055906a73ab':
  removed old/obsolete file GLEScontext.cpp
2011-06-07 13:24:38 -07:00
David Turner
ea4284a78a am f3c78295: am e6868d1e: am 299a140c: Merge "Fix issues raised by the GLES 1.1 conformance test"
* commit 'f3c78295e6d7415b9899778f07ff7ba32ede136e':
  Fix issues raised by the GLES 1.1 conformance test
2011-06-07 13:24:34 -07:00
David Turner
0677b7a1e3 am f68103bf: am 1e4d92ca: am 67032b23: Merge "Fix a bug where eglMakeCurrent(NULL) did not work"
* commit 'f68103bf0df892b35c66615efd4c504ef7e96918':
  Fix a bug where eglMakeCurrent(NULL) did not work
2011-06-07 13:24:29 -07:00
David Turner
0c5fb2eea7 am b848ebfe: am 62f593fa: am 7660bb58: Merge "Fix a mess in contexts/surfaces reference count"
* commit 'b848ebfedca6087a327ffab2c402828398241b0a':
  Fix a mess in contexts/surfaces reference count
2011-06-07 13:24:24 -07:00
Jean-Baptiste Queru
331b2a6f83 am 6d0d6ef1: am fc618484: Merge from gingerbread
* commit '6d0d6ef1598502c20776d443ad93e18b036443be':
2011-06-07 13:23:33 -07:00
David Turner
01dca04f26 am 5eac0624: am 8821d5a5: Merge "ThreadInfo- use explicit rather than void pointers"
* commit '5eac0624d2307ee537d0b4ee6587a02738118c29':
  ThreadInfo- use explicit rather than void pointers
2011-06-07 13:22:24 -07:00
David Turner
1a34e175fc am 3f232d30: am 0b05185e: Merge "Fix version returned by eglInitialize from 4.1 to 1.4."
* commit '3f232d30586cddb9b463c7557095906fd58a2db7':
  Fix version returned by eglInitialize from 4.1 to 1.4.
2011-06-07 13:22:18 -07:00
David Turner
f90611b840 am 9448b1c2: am 8c141dd2: Merge "EglChooseConfig should handle the case where "configs" is NULL."
* commit '9448b1c2822eaf7a55ceaa3feefa88941d8b47d9':
  EglChooseConfig should handle the case where "configs" is NULL.
2011-06-07 13:22:13 -07:00
David Turner
cb802ae3d9 am 6d70e8c3: am bf483268: Merge "Emulators\'s GLES 2.0 translator implementation This is the GLESv2 on top of openGL implementation on the host most of this change is moving code which is necessary by both GLES 1.0 and GLES 2.0 implementations from GLES_CM folder into
* commit '6d70e8c39ec00488ce8acb94d39a77072d9ef465':
  Emulators's GLES 2.0 translator implementation This is the GLESv2 on top of openGL implementation on the host most of this change is moving code which is necessary by both GLES 1.0 and GLES 2.0 implementations from GLES_CM folder into GLcommon folder.
2011-06-07 13:21:44 -07:00
Ying Wang
e4ccbd68ec Use a function to package android support libraries.
Change-Id: I52240b31fba7728b74d57fd806a93988e3ac8fe9
2011-06-07 11:25:07 -07:00
Dianne Hackborn
518936d32b am b36c8d68: am 0a9365f8: am 7ffb7d4b: Update pager demos to match new v4 ViewPager API.
* commit 'b36c8d68a33d12086bf74ccaa826e8dae67ce673':
  Update pager demos to match new v4 ViewPager API.
2011-06-07 11:13:47 -07:00
Xavier Ducrohet
733342c712 am 76fb8500: am 80f84422: Add v13 to the compatibility package.
* commit '76fb8500d32e0d9a64b2d00522237d6d8f7a71e9':
  Add v13 to the compatibility package.
2011-06-07 10:58:00 -07:00
Xavier Ducrohet
76fb8500d3 am 80f84422: Add v13 to the compatibility package.
* commit '80f844229137cb0d78689ea61aea37da4c770c8c':
  Add v13 to the compatibility package.
2011-06-07 10:48:13 -07:00
Brett Chabot
cdfaae1a34 Make runtest reboot and root more robust.
Add a couple sleep statements to allow time for device to go offline.

Change-Id: I3a5fffc948f6c7b67bcdec4526990a6becd2d02f
2011-06-07 10:16:02 -07:00
Brett Chabot
8207c8935b Merge "Remove runtest hard dependency on test_defs.xml files." 2011-06-07 10:08:09 -07:00
Brett Chabot
3c9cefc70f Remove runtest hard dependency on test_defs.xml files.
Previously runtest would fail hard if development/test_runner/test_defs.xml
file was not present, even if it wasn't needed (ie running in --path mode).

This commit skips test_defs parsing if --path is specified, and only parses
development/test_runner/test_defs.xml if its present.

Bug 4556556

Change-Id: Ief2dbbdab5c7e82e5db64414392d6e2a564e815d
2011-06-07 08:27:36 -07:00
David Turner
1ccce78ed6 am e490d50e: am 8c7d5519: Merge "opengl translator: make GLcommon static library"
* commit 'e490d50ed5f5422e386c32b953c0ce79496aa961':
  opengl translator: make GLcommon static library
2011-06-07 02:38:31 -07:00
David Turner
e490d50ed5 am 8c7d5519: Merge "opengl translator: make GLcommon static library"
* commit '8c7d5519e27fb53522da51f2f6bec1c1ac6388a8':
  opengl translator: make GLcommon static library
2011-06-07 02:36:40 -07:00
David Turner
8c7d5519e2 Merge "opengl translator: make GLcommon static library" 2011-06-07 02:29:44 -07:00
Guy Zadikario
cd1489a89c opengl translator: make GLcommon static library
This change turns GLcommon to be static instead of shared
library.
Removed the s_globalNameSpace static object from objectNameManager
and moved it to live inside the EglDisplay object which is shared
for all display space objects (GLESv1, GLESv2 and EGL).

Change-Id: I92fa71fb7cbac423c22b7188e8d9642a5fddf0d9
2011-06-07 11:29:15 +02:00
David Turner
f61e7a3c98 am 94f566f8: am cc3b3887: Merge "opengl translator: moved some types out of eglplatform.h"
* commit '94f566f86d11536765243342818c94b70200b519':
  opengl translator: moved some types out of eglplatform.h
2011-06-07 02:21:11 -07:00
David Turner
ee00d4b413 am 7870c9f5: am 8a96cb7e: Merge "opengl translator: initialize dispatch with dummy functions"
* commit '7870c9f5130b86a92ae0d4a40951746d01f65c1c':
  opengl translator: initialize dispatch with dummy functions
2011-06-07 02:21:08 -07:00
David Turner
94f566f86d am cc3b3887: Merge "opengl translator: moved some types out of eglplatform.h"
* commit 'cc3b38874689e963fea10347f11cee3b62635c8e':
  opengl translator: moved some types out of eglplatform.h
2011-06-07 02:08:52 -07:00
David Turner
7870c9f513 am 8a96cb7e: Merge "opengl translator: initialize dispatch with dummy functions"
* commit '8a96cb7e8bd4b951c4a61df10f2103b65ae3e74c':
  opengl translator: initialize dispatch with dummy functions
2011-06-07 02:08:47 -07:00
David Turner
cc3b388746 Merge "opengl translator: moved some types out of eglplatform.h" 2011-06-07 01:40:48 -07:00
David Turner
8a96cb7e8b Merge "opengl translator: initialize dispatch with dummy functions" 2011-06-07 01:40:33 -07:00
Bruno Oliveira
b30a3010f5 Adds the Random Music Player sample.
This sample illustrates how to write an application that plays media
in the background, handles streaming media from the network and
reacts appropriately to system events like headphone disconnection and
audio focus changes, and also uses the notification system to
keep the user informed about what is happening.

This CL is a cherrypick of the old CL 104495 (originally in
honeycomb-mr1) into honeycomb-mr2. Original CL:
https://android-git.corp.google.com/g/#change,104495

Change-Id: Ib8b15ee920300adc093a8b52c17bd9c251ac74ca
2011-06-07 01:09:21 -04:00
Xavier Ducrohet
80f8442291 Add v13 to the compatibility package.
Also remove ApiDemos from the package and instead
add each library-specific sample app to each v##
folder.

Change-Id: I2932bbb91c7122c122973902d1fcd159ca899381
2011-06-06 19:21:45 -07:00
David 'Digit' Turner
b257bb8ab4 am e9c7386b: am e011bed4: Merge "ndk: x86: Sanitize platform headers and libraries."
* commit 'e9c7386b0506f7c2f0bc258e3a899fcbe64adc3e':
  ndk: x86: Sanitize platform headers and libraries.
2011-06-06 17:30:49 -07:00
Dianne Hackborn
b36c8d68a3 am 0a9365f8: am 7ffb7d4b: Update pager demos to match new v4 ViewPager API.
* commit '0a9365f82530e63334e023b605f71968b48ce91c':
  Update pager demos to match new v4 ViewPager API.
2011-06-06 15:18:59 -07:00
Dianne Hackborn
0a9365f825 am 7ffb7d4b: Update pager demos to match new v4 ViewPager API.
* commit '7ffb7d4b2face7d2ce5cee82c92ec36fd0ba2932':
  Update pager demos to match new v4 ViewPager API.
2011-06-06 15:12:15 -07:00
Dianne Hackborn
7ffb7d4b2f Update pager demos to match new v4 ViewPager API.
Change-Id: I3b0f3382d56b477868b5a5fbf5af22fa83c3e06a
2011-06-06 15:01:45 -07:00
David Turner
638e7d8bd2 am 5f82c3ab: am a1b9f9bc: Merge "implementing mac OS support for translator\'s libs"
* commit '5f82c3ab8fb726376ed2abcb5237c8b90d616edf':
  implementing mac OS support for translator's libs
2011-06-06 09:08:07 -07:00
David Turner
2e8d5e1dab am 4de570c9: am f3c023e4: Merge "opengl translator: GLSL ES translation"
* commit '4de570c974d0d001edd95804eb1a95c1078cfa6b':
  opengl translator: GLSL ES translation
2011-06-06 09:08:05 -07:00
David Turner
9178b80ce4 am eae0aff8: am 87043c4e: Merge "opengl translator: added EGL_RENDERABLE_TYPE attrib"
* commit 'eae0aff8d44e339d8f79b6cadec985e8f9c349e2':
  opengl translator: added EGL_RENDERABLE_TYPE attrib
2011-06-06 09:07:58 -07:00
David Turner
5f82c3ab8f am a1b9f9bc: Merge "implementing mac OS support for translator\'s libs"
* commit 'a1b9f9bc1683bc8a69d274f496ac3a0307fe5656':
  implementing mac OS support for translator's libs
2011-06-06 09:04:00 -07:00