Commit Graph

10761 Commits

Author SHA1 Message Date
Andrew Hsieh
29539e93c9 Fixed to #include correct 32-bit headers
Corrected for example <asm/io.h> to include io_32.h instead of io_64.h
(which is missing, BTW).

Copied from the results of commit (same title) in bionic.git:
126601dd3f5303b50033dcb88945d928aa764aa4

Change-Id: I49547d5253459396bfc85012b1fd263ad5c7e9d0
2012-03-24 11:28:40 +08:00
Dianne Hackborn
a71d47a718 Add API demo for thumbnail animations.
Change-Id: I97f03f4a172a820d7856bd663a6bc00e3b9521cd
2012-03-23 16:37:04 -07:00
Mathias Agopian
75112faa99 add missing include
Change-Id: I497b03052274347f1cf47c4b276ab1d2c61f6db2
2012-03-23 14:14:32 -07:00
Raphael Moll
735288344c am 7a5d41c4: am 9c7b559f: SDK source pkg: exclude all /tools/ and /tests/ directories.
* commit '7a5d41c4ba999267b62fe084dbb186240fba6015':
2012-03-23 10:43:43 -07:00
Raphael Moll
9be260a247 am e7a1083b: am 9c7b559f: SDK source pkg: exclude all /tools/ and /tests/ directories.
* commit 'e7a1083bca804f0417ff96d1495ee38f39855453':
  SDK source pkg: exclude all /tools/ and /tests/ directories.
2012-03-23 10:39:59 -07:00
Raphael Moll
7a5d41c4ba am 9c7b559f: SDK source pkg: exclude all /tools/ and /tests/ directories.
* commit '9c7b559fb730c57a522abb2956c0036edcd15e63':
  SDK source pkg: exclude all /tools/ and /tests/ directories.
2012-03-23 10:38:17 -07:00
Raphael Moll
e7a1083bca am 9c7b559f: SDK source pkg: exclude all /tools/ and /tests/ directories.
* commit '9c7b559fb730c57a522abb2956c0036edcd15e63':
  SDK source pkg: exclude all /tools/ and /tests/ directories.
2012-03-23 10:37:59 -07:00
Raphael Moll
262a0f106f am 9c7b559f: SDK source pkg: exclude all /tools/ and /tests/ directories.
* commit '9c7b559fb730c57a522abb2956c0036edcd15e63':
  SDK source pkg: exclude all /tools/ and /tests/ directories.
2012-03-23 10:37:57 -07:00
Raphael Moll
9c7b559fb7 SDK source pkg: exclude all /tools/ and /tests/ directories.
Change-Id: Ia85105385280e21f073cef22e1130ad369bea121
2012-03-23 10:27:04 -07:00
Jesse Hall
d5882467c1 EmuGL: Deliver every frame to a callback
To enable multi-touch on a tethered device, allow a callback to be
registered with the OpenGL renderer. On every frame, the framebuffer
is read into system memory and provided to the callback, so it can be
mirrored to the device.

This change is co-dependent on Idae3b026d52ed8dd666cbcdc3f3af80175c90ad3
in external/qemu.

Change-Id: I03c49bc55ed9e66ffb59462333181f77e7e46035
2012-03-22 18:19:00 -07:00
Jean-Baptiste Queru
c1b4dec356 am 97e156fc: am f0d21111: am bbbc7e26: am 6c368d28: Merge "Fix build - configure for schema-v4 output"
* commit '97e156fcd62cb9175d477b73eea3a96fbd4d17cf':
  Fix build - configure for schema-v4 output
2012-03-22 17:57:03 -07:00
Jean-Baptiste Queru
97e156fcd6 am f0d21111: am bbbc7e26: am 6c368d28: Merge "Fix build - configure for schema-v4 output"
* commit 'f0d21111496df3084e69f97ae68efa186494b4f8':
  Fix build - configure for schema-v4 output
2012-03-22 17:54:23 -07:00
Jean-Baptiste Queru
f0d2111149 am bbbc7e26: am 6c368d28: Merge "Fix build - configure for schema-v4 output"
* commit 'bbbc7e26be6a05e993570d0908eb8b06ae88e5fb':
  Fix build - configure for schema-v4 output
2012-03-22 17:53:05 -07:00
Jean-Baptiste Queru
bbbc7e26be am 6c368d28: Merge "Fix build - configure for schema-v4 output"
* commit '6c368d28f57a45e8310fa0a8cdea240a42c2555e':
  Fix build - configure for schema-v4 output
2012-03-22 17:51:44 -07:00
Jean-Baptiste Queru
6c368d28f5 Merge "Fix build - configure for schema-v4 output" 2012-03-22 17:30:52 -07:00
Jean-Baptiste Queru
e35ac78cd4 Fix build - configure for schema-v4 output
Change-Id: I26b334e54b38cba49e84212fbe40250fb16dc738
2012-03-22 15:51:17 -07:00
Amith Yamasani
4769636d98 Merge "Package control per user" 2012-03-22 15:12:00 -07:00
Jesse Hall
4dafe31aea Merge "Revert "EmuGL: Deliver every frame to a callback"" 2012-03-22 14:02:46 -07:00
Jesse Hall
8a33c36682 Revert "EmuGL: Deliver every frame to a callback"
This reverts commit 08d643e5eb
2012-03-22 13:56:36 -07:00
Jesse Hall
735967c2e5 Merge "EmuGL: Deliver every frame to a callback" 2012-03-22 13:48:33 -07:00
Jean-Baptiste Queru
ec9a28d403 am 7db0c0f7: (-s ours) am 4e3792d5: am 79977b40: am 8d2f79ba: Merge "SDK: generate repo using latest schemas when available."
* commit '7db0c0f7afc06f4f89e38ba0640fa7e5e4c36758':
  SDK: generate repo using latest schemas when available.
2012-03-22 13:36:07 -07:00
Andrew Hsieh
259b451090 am 897351bd: am fd3b518f: am 9e3e95f6: am 76780669: Added rules to build 64-bit libraries for 64-bit emulator
* commit '897351bd609529fa84973c53350d0e0315825052':
  Added rules to build 64-bit libraries for 64-bit emulator
2012-03-22 13:33:54 -07:00
Jean-Baptiste Queru
7db0c0f7af am 4e3792d5: am 79977b40: am 8d2f79ba: Merge "SDK: generate repo using latest schemas when available."
* commit '4e3792d556d84fbb874d482b6f77853f767068d3':
  SDK: generate repo using latest schemas when available.
2012-03-22 13:31:58 -07:00
Andrew Hsieh
897351bd60 am fd3b518f: am 9e3e95f6: am 76780669: Added rules to build 64-bit libraries for 64-bit emulator
* commit 'fd3b518f7503030e8cd8f3908d72e1f9d8bf327f':
  Added rules to build 64-bit libraries for 64-bit emulator
2012-03-22 13:31:57 -07:00
Jean-Baptiste Queru
4e3792d556 am 79977b40: am 8d2f79ba: Merge "SDK: generate repo using latest schemas when available."
* commit '79977b408bd50af2884907bdeb62b4d67a9f9fff':
  SDK: generate repo using latest schemas when available.
2012-03-22 13:30:16 -07:00
Andrew Hsieh
fd3b518f75 am 9e3e95f6: am 76780669: Added rules to build 64-bit libraries for 64-bit emulator
* commit '9e3e95f65fa8415c38a10caa3f211b9b9f896df5':
  Added rules to build 64-bit libraries for 64-bit emulator
2012-03-22 13:30:15 -07:00
Jesse Hall
08d643e5eb EmuGL: Deliver every frame to a callback
To enable multi-touch on a tethered device, allow a callback to be
registered with the OpenGL renderer. On every frame, the framebuffer
is read into system memory and provided to the callback, so it can be
mirrored to the device.

This change is co-dependent on Idae3b026d52ed8dd666cbcdc3f3af80175c90ad3
in external/qemu.

Change-Id: I03c49bc55ed9e66ffb59462333181f77e7e46035
2012-03-22 13:29:00 -07:00
Jean-Baptiste Queru
79977b408b am 8d2f79ba: Merge "SDK: generate repo using latest schemas when available."
* commit '8d2f79ba939e0394cf18489503a6f2a3ebcce8f6':
  SDK: generate repo using latest schemas when available.
2012-03-22 13:27:44 -07:00
Andrew Hsieh
9e3e95f65f am 76780669: Added rules to build 64-bit libraries for 64-bit emulator
* commit '76780669f9867587693563358ccdc903e9cdcbba':
  Added rules to build 64-bit libraries for 64-bit emulator
2012-03-22 13:27:43 -07:00
Jean-Baptiste Queru
1fa4587555 am 7722b766: (-s ours) am 5ec7bda1: am 40b67a0e: Merge 8aafafe4
* commit '7722b76683a8d35672a5b41b036810178fb65ebf':
  Fixed crash and 64-bit porting issues
2012-03-22 13:12:13 -07:00
Jean-Baptiste Queru
7722b76683 am 5ec7bda1: am 40b67a0e: Merge 8aafafe4
* commit '5ec7bda1f5686f8ce0236569931d2b881252f4fe':
  Fixed crash and 64-bit porting issues
2012-03-22 13:03:31 -07:00
Jean-Baptiste Queru
5ec7bda1f5 am 40b67a0e: Merge 8aafafe4
* commit '40b67a0eb0ae7c612dd30611121cf3c655c49793':
  Fixed crash and 64-bit porting issues
2012-03-22 13:01:06 -07:00
Jean-Baptiste Queru
40b67a0eb0 Merge 8aafafe4
Change-Id: I41f097b5b96c4d000b1748b9e0411497d323556a
2012-03-22 12:57:54 -07:00
Jean-Baptiste Queru
8d2f79ba93 Merge "SDK: generate repo using latest schemas when available." 2012-03-22 12:54:17 -07:00
Andrew Hsieh
76780669f9 Added rules to build 64-bit libraries for 64-bit emulator
All ten libraries can now be built in 64-bit named "lib64*" (*)
in addition to the original 32-bit form named "lib*".

Also, dlopen "lib64*so" in 64-bit.

(*) eg. In Ubuntu, all can be built with the following command:
  make out/host/linux-x86/lib/lib64OpenglRender.so \
       out/host/linux-x86/lib/lib64EGL_translator.so \
       out/host/linux-x86/lib/lib64GLES_CM_translator.so \
       out/host/linux-x86/lib/lib64GLES_V2_translator.so

Rules to build static libraries lib64log.a, lib64cutils.a and lib64utils.a
they depend were added in other CLs.

Change-Id: I3afb64de6dda1d55dbd1b4443d2dbc78a683b19f
2012-03-22 12:36:45 -07:00
Andrew Hsieh
8aafafe4bd Fixed crash and 64-bit porting issues
1. "emugen" generates four *dec.cpp files containing code like this
   to decode offset to pointer in stream

   tmp = *(T *)(ptr + 8 + 4 + 4 + 4 + *(size_t *)(ptr +8 + 4 + 4));

   If *dec.cpp are compiled in 64-bit, size_t is 8-byte and dereferencing of
   it is likley to get wild offset for dereferencing of *(T *) to crash the
   code.  Solution is to define tsize_t for "target size_t" instead
   of using host size_t.

2. Cast pointer to "uintptr_t" instead of "unsigned int" for 2nd param of
   ShareGroup::getGlobalName(NamedObjectType, ObjectLocalName/*64bit*/).
3. Instance of EGLSurface, EGLContext and EGLImageKHR are used as 32-bit
   key for std::map< unsigned int, * > SurfacesHndlMap, ContextsHndlMap,
   and ImagesHndlMap, respectively.  Cast pointer to uintptr_t and assert
   upper 32-bit is zero before passing to map::find().
4. Instance of GLeglImageOES is used to eglAttachEGLImage() which expect
   "unsigned int".  Cast it to uintptr_t and assert upper 32-bit is zero.
5. The 5th param to GLEScontext::setPointer is GLvoid* but contains 32-bit
   offset to vbo if bufferName exists.  Cast it to uintptr_t and assert
   upper 32-bit is zero.
6. Use %zu instead of %d to print size_t
7. Cast pointer to (uintptr_t) in many other places

Change-Id: Iba6e5bda08c43376db5b011e9d781481ee1f5a12
2012-03-22 11:10:31 -07:00
Andrew Hsieh
124ad70320 Merge "Refactor with ToTargetCompatibleHandle()" 2012-03-21 20:16:44 -07:00
Raphael Moll
8f7e1f7a95 SDK: generate repo using latest schemas when available.
This generates a repository in either v5 or v6 and adjusts
the name/vendor attributes accordingly.

This extracts the support extra in a separate 'repo-extras.xml'
which has an addon.xsd type instead of being a repository.xsd.

Requires sdk.git change Ib0363f06 to build properly.

Change-Id: I250fe7a3ec0dfa490778ae747a1a8f4e536bb395
2012-03-21 19:08:11 -07:00
Xavier Ducrohet
34460c1e62 am 5934ff4f: am 5756679f: am 37bae214: Add flag indicating gpu support in emulator system image.
* commit '5934ff4f3d58ebfaf602e6f56ac35b9717a53410':
2012-03-21 17:01:01 -07:00
Xavier Ducrohet
ee517e7b10 am 13dbd7d2: (-s ours) am 3280e948: am 37bae214: Add flag indicating gpu support in emulator system image.
* commit '13dbd7d2eb4d53d5594ec558d8011c2aa1e332d0':
  Add flag indicating gpu support in emulator system image.
2012-03-21 17:01:00 -07:00
Xavier Ducrohet
5065651941 Merge "Add flag indicating gpu support in emulator system image." 2012-03-21 17:00:44 -07:00
Xavier Ducrohet
8c12262936 Add flag indicating gpu support in emulator system image.
Change-Id: Ica0c02c4d65a3311254f3d46a71956044bf46b82
2012-03-21 17:00:21 -07:00
Xavier Ducrohet
5934ff4f3d am 5756679f: am 37bae214: Add flag indicating gpu support in emulator system image.
* commit '5756679f28466cddc95dc99b9e124792716f95f0':
2012-03-21 16:51:48 -07:00
Xavier Ducrohet
13dbd7d2eb am 3280e948: am 37bae214: Add flag indicating gpu support in emulator system image.
* commit '3280e9480fa6e8061e9d819ae64ec7ba948a94f5':
  Add flag indicating gpu support in emulator system image.
2012-03-21 16:51:13 -07:00
Xavier Ducrohet
2e6a8d027c am 37bae214: Add flag indicating gpu support in emulator system image.
* commit '37bae214eed57ab4b9908fb07a6be3c0f8bf141b':
  Add flag indicating gpu support in emulator system image.
2012-03-21 16:48:28 -07:00
Xavier Ducrohet
5756679f28 am 37bae214: Add flag indicating gpu support in emulator system image.
* commit '37bae214eed57ab4b9908fb07a6be3c0f8bf141b':
  Add flag indicating gpu support in emulator system image.
2012-03-21 16:48:22 -07:00
Xavier Ducrohet
3280e9480f am 37bae214: Add flag indicating gpu support in emulator system image.
* commit '37bae214eed57ab4b9908fb07a6be3c0f8bf141b':
  Add flag indicating gpu support in emulator system image.
2012-03-21 16:48:17 -07:00
Xavier Ducrohet
37bae214ee Add flag indicating gpu support in emulator system image.
Change-Id: I21040f50f8e95b389c1e6db2de93654be6da6f7e
2012-03-21 16:44:12 -07:00
Mike Lockwood
9a0d40c2f0 Merge remote-tracking branch 'goog/ics-aah-exp' 2012-03-21 15:30:52 -07:00
Mike Lockwood
ffc002ef30 Merge commit 'fb11862390f6468a24a3a7aef57ffcfc0f5a3290'
Merge "Increase default runtest -j to 16." into ics-aah

Change-Id: I150ea819617fcfa0e60d14e758d002849718dda2
2012-03-21 15:30:25 -07:00