Andrew Hsieh
d3830daec2
am 314dea12: am 58f599f9: am 2038b5ac: am 799fada5: Merge "ndk: Include limits.h in wchar.h as it contains the definitions for INT_MAX and INT_MIN. Without this fix, the following lines will fail when configuring gnu stdlibc++ library. (INT_MAX and INT_MIN are undefin
...
* commit '314dea12dfec428d9e832ab10a52e75dea1a130e':
ndk: Include limits.h in wchar.h as it contains the definitions for INT_MAX and INT_MIN. Without this fix, the following lines will fail when configuring gnu stdlibc++ library. (INT_MAX and INT_MIN are undefined.)
2012-03-27 10:19:43 -07:00
Andrew Hsieh
4f02cbed4d
am 5a0380a0: am 360a16af: am 47de63df: am 2e71de56: Merge "ndk: <signal.h>: include <asm/sigcontext.h>"
...
* commit '5a0380a06f93fd09864e3e45a760ec654763e443':
ndk: <signal.h>: include <asm/sigcontext.h>
2012-03-27 10:19:42 -07:00
Jesse Hall
bebaa976c4
am 1cc6451d: am e824ff28: am db9e12c6: am 71aa2fca: Merge "EmuGL: Deliver every frame to a callback"
...
* commit '1cc6451d69c010008f4dded82b864043e0af8b92':
EmuGL: Deliver every frame to a callback
2012-03-27 10:10:51 -07:00
Jesse Hall
32dfc0c7f9
am 937a3607: am 2159202d: am 64cd8f35: EmuGL: use custom egl.cfg in Google APIs add-on
...
* commit '937a360737438b41d55d72cbbf7153d94545aaef':
2012-03-27 10:10:44 -07:00
Jesse Hall
501566de2d
am ad471361: am 64cec470: am 64cd8f35: EmuGL: use custom egl.cfg in Google APIs add-on
...
* commit 'ad471361f1400838fa61fed1e7e45a15f6da6809':
EmuGL: use custom egl.cfg in Google APIs add-on
2012-03-27 10:10:43 -07:00
Andrew Hsieh
314dea12df
am 58f599f9: am 2038b5ac: am 799fada5: Merge "ndk: Include limits.h in wchar.h as it contains the definitions for INT_MAX and INT_MIN. Without this fix, the following lines will fail when configuring gnu stdlibc++ library. (INT_MAX and INT_MIN are undefined.)"
...
* commit '58f599f9aa3102fa06ca2dc729014cce33b74bbf':
ndk: Include limits.h in wchar.h as it contains the definitions for INT_MAX and INT_MIN. Without this fix, the following lines will fail when configuring gnu stdlibc++ library. (INT_MAX and INT_MIN are undefined.)
2012-03-27 09:42:56 -07:00
Andrew Hsieh
5a0380a06f
am 360a16af: am 47de63df: am 2e71de56: Merge "ndk: <signal.h>: include <asm/sigcontext.h>"
...
* commit '360a16af7edb82dc9ce8f1c2f6fb1e3c8f40f13b':
ndk: <signal.h>: include <asm/sigcontext.h>
2012-03-27 09:42:55 -07:00
Andrew Hsieh
58f599f9aa
am 2038b5ac: am 799fada5: Merge "ndk: Include limits.h in wchar.h as it contains the definitions for INT_MAX and INT_MIN. Without this fix, the following lines will fail when configuring gnu stdlibc++ library. (INT_MAX and INT_MIN are undefined.)"
...
* commit '2038b5acc50b7eb848becb6a03897918669a9dd3':
ndk: Include limits.h in wchar.h as it contains the definitions for INT_MAX and INT_MIN. Without this fix, the following lines will fail when configuring gnu stdlibc++ library. (INT_MAX and INT_MIN are undefined.)
2012-03-27 09:41:22 -07:00
Andrew Hsieh
360a16af7e
am 47de63df: am 2e71de56: Merge "ndk: <signal.h>: include <asm/sigcontext.h>"
...
* commit '47de63df5ca4512cc71467e691193ee0262834be':
ndk: <signal.h>: include <asm/sigcontext.h>
2012-03-27 09:41:21 -07:00
Andrew Hsieh
2038b5acc5
am 799fada5: Merge "ndk: Include limits.h in wchar.h as it contains the definitions for INT_MAX and INT_MIN. Without this fix, the following lines will fail when configuring gnu stdlibc++ library. (INT_MAX and INT_MIN are undefined.)"
...
* commit '799fada598b048b02bf63c0eea9b6d676f9be142':
ndk: Include limits.h in wchar.h as it contains the definitions for INT_MAX and INT_MIN. Without this fix, the following lines will fail when configuring gnu stdlibc++ library. (INT_MAX and INT_MIN are undefined.)
2012-03-27 09:39:02 -07:00
Andrew Hsieh
47de63df5c
am 2e71de56: Merge "ndk: <signal.h>: include <asm/sigcontext.h>"
...
* commit '2e71de568e54242952726e437fab92508353a33b':
ndk: <signal.h>: include <asm/sigcontext.h>
2012-03-27 09:39:01 -07:00
Andrew Hsieh
799fada598
Merge "ndk: Include limits.h in wchar.h as it contains the definitions for INT_MAX and INT_MIN. Without this fix, the following lines will fail when configuring gnu stdlibc++ library. (INT_MAX and INT_MIN are undefined.)"
2012-03-27 04:33:53 -07:00
Andrew Hsieh
2e71de568e
Merge "ndk: <signal.h>: include <asm/sigcontext.h>"
2012-03-27 04:31:38 -07:00
Jesse Hall
1cc6451d69
am e824ff28: am db9e12c6: am 71aa2fca: Merge "EmuGL: Deliver every frame to a callback"
...
* commit 'e824ff28a615c42d0438b5a6f84cf098c219ed11':
EmuGL: Deliver every frame to a callback
2012-03-26 18:31:12 -07:00
Jesse Hall
e824ff28a6
am db9e12c6: am 71aa2fca: Merge "EmuGL: Deliver every frame to a callback"
...
* commit 'db9e12c671a44f84642d29427633513590516674':
EmuGL: Deliver every frame to a callback
2012-03-26 18:29:42 -07:00
Jesse Hall
db9e12c671
am 71aa2fca: Merge "EmuGL: Deliver every frame to a callback"
...
* commit '71aa2fcac1cd1e5d59c210b5dd332ca4aefba530':
EmuGL: Deliver every frame to a callback
2012-03-26 18:27:10 -07:00
Jesse Hall
71aa2fcac1
Merge "EmuGL: Deliver every frame to a callback"
2012-03-26 15:42:22 -07:00
Jesse Hall
937a360737
am 2159202d: am 64cd8f35: EmuGL: use custom egl.cfg in Google APIs add-on
...
* commit '2159202da13af7ff904ef118051e5fc29247eb6c':
2012-03-26 15:37:09 -07:00
Jesse Hall
ad471361f1
am 64cec470: am 64cd8f35: EmuGL: use custom egl.cfg in Google APIs add-on
...
* commit '64cec4708d00aa994429e6373073e9efcd9397e0':
EmuGL: use custom egl.cfg in Google APIs add-on
2012-03-26 15:36:52 -07:00
Jesse Hall
64cec4708d
am 64cd8f35: EmuGL: use custom egl.cfg in Google APIs add-on
...
* commit '64cd8f35fb9cefdeaaded4025af011d1d4c9b90a':
EmuGL: use custom egl.cfg in Google APIs add-on
2012-03-26 15:34:41 -07:00
Jesse Hall
2159202da1
am 64cd8f35: EmuGL: use custom egl.cfg in Google APIs add-on
...
* commit '64cd8f35fb9cefdeaaded4025af011d1d4c9b90a':
EmuGL: use custom egl.cfg in Google APIs add-on
2012-03-26 15:33:46 -07:00
Jesse Hall
64cd8f35fb
EmuGL: use custom egl.cfg in Google APIs add-on
...
Change-Id: I30468d668ce72cf3a4de1cace1f8e4f1610b9756
2012-03-26 15:07:00 -07:00
The Android Automerger
2260c222a1
merge in jb-release history after reset to master
2012-03-26 07:00:49 -07:00
Raphael Moll
26464cc1e0
am 73528834: am 7a5d41c4: am 9c7b559f: SDK source pkg: exclude all /tools/ and /tests/ directories.
...
* commit '735288344c91cdcf1c96fd6909e7e0985ef32825':
2012-03-24 10:27:25 -07:00
Raphael Moll
fc188dcc3e
am 9be260a2: am e7a1083b: am 9c7b559f: SDK source pkg: exclude all /tools/ and /tests/ directories.
...
* commit '9be260a24746634cc66e223244d86da7a36bbe2b':
SDK source pkg: exclude all /tools/ and /tests/ directories.
2012-03-24 10:27:24 -07:00
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