Andrew Hsieh
08f4a2848e
am b7e584c9: am b002fa5f: am 2c950473: Merge "MIPS platform files for building the NDK"
...
* commit 'b7e584c94b23aab20377660eea7f9fd062321c7a':
MIPS platform files for building the NDK
2012-03-30 22:35:22 -07:00
Andrew Hsieh
eb112748e2
am 844020ac: am 7512bce0: am 49513bb2: Merge "[MIPS] crt* Object files generated from .S files. The object files are generated with the assembler built from binutils-2.21"
...
* commit '844020ace77515e55a6dc7a09e17c1a90f4178ac':
[MIPS] crt* Object files generated from .S files. The object files are generated with the assembler built from binutils-2.21
2012-03-30 22:35:21 -07:00
Andrew Hsieh
b7e584c94b
am b002fa5f: am 2c950473: Merge "MIPS platform files for building the NDK"
...
* commit 'b002fa5fc82c71c10ebf1740dc8c83faacc032ef':
MIPS platform files for building the NDK
2012-03-30 22:33:21 -07:00
Andrew Hsieh
844020ace7
am 7512bce0: am 49513bb2: Merge "[MIPS] crt* Object files generated from .S files. The object files are generated with the assembler built from binutils-2.21"
...
* commit '7512bce044a0b8c995026ccc8db22f8f67154439':
[MIPS] crt* Object files generated from .S files. The object files are generated with the assembler built from binutils-2.21
2012-03-30 22:33:20 -07:00
Andrew Hsieh
b002fa5fc8
am 2c950473: Merge "MIPS platform files for building the NDK"
...
* commit '2c9504731b2338b28640a752b94bc8c41299e6cb':
MIPS platform files for building the NDK
2012-03-30 22:31:30 -07:00
Andrew Hsieh
7512bce044
am 49513bb2: Merge "[MIPS] crt* Object files generated from .S files. The object files are generated with the assembler built from binutils-2.21"
...
* commit '49513bb2c3105b43e81e1d6dbace3626750bd1a8':
[MIPS] crt* Object files generated from .S files. The object files are generated with the assembler built from binutils-2.21
2012-03-30 22:31:29 -07:00
Andrew Hsieh
2c9504731b
Merge "MIPS platform files for building the NDK"
2012-03-30 19:10:05 -07:00
Andrew Hsieh
49513bb2c3
Merge "[MIPS] crt* Object files generated from .S files. The object files are generated with the assembler built from binutils-2.21"
2012-03-30 19:07:23 -07:00
Raghu Gandham
22d3d88a7a
[MIPS] crt* Object files generated from .S files.
...
The object files are generated with the assembler
built from binutils-2.21
2012-03-30 18:27:51 -07:00
Chao-Ying Fu
718e73cf26
MIPS platform files for building the NDK
...
Change-Id: If19af75003aeb8872d23d7901f01c434bdc58a5f
2012-03-30 18:09:22 -07:00
Dianne Hackborn
adee1fdf63
Update Full Screen Modes to demostrate more modes.
...
UI is now a set of check boxes to toggle the various modes.
Also add new API demos for two typical implementations using
system UI flags: a content browser and a video player.
Change-Id: If93659343cfc42b903b18997a5a0a04ee10e8343
2012-03-30 17:13:06 -07:00
Andrew Hsieh
8d83be988a
Fixed win_sdk build due to rs relocation
...
frameworks/base/libs/rs got promoted to its own git at frameworks/rs.
See https://android-git.corp.google.com/g/#/c/176760
Change-Id: I7ae8ed1df899eade42c77a85d2a63d012aa9fa13
2012-03-29 18:42:35 +08:00
Andrew Hsieh
cb69624158
am 9c8dbc67: am 0e8d9416: am 1a94764c: Merge "ndk: Add MIPS Platform files which contain C runtime headers and sources of crt* assembler files"
...
* commit '9c8dbc678008662dbcfc442650da099839b4bbe1':
ndk: Add MIPS Platform files which contain C runtime headers and sources of crt* assembler files
2012-03-28 23:49:35 -07:00
Andrew Hsieh
9c8dbc6780
am 0e8d9416: am 1a94764c: Merge "ndk: Add MIPS Platform files which contain C runtime headers and sources of crt* assembler files"
...
* commit '0e8d941644d0d71b2999a30069eda8f9cf4e2b88':
ndk: Add MIPS Platform files which contain C runtime headers and sources of crt* assembler files
2012-03-28 23:47:25 -07:00
Andrew Hsieh
0e8d941644
am 1a94764c: Merge "ndk: Add MIPS Platform files which contain C runtime headers and sources of crt* assembler files"
...
* commit '1a94764ca2b8824d797ad3df38c318c6c85008ac':
ndk: Add MIPS Platform files which contain C runtime headers and sources of crt* assembler files
2012-03-28 23:45:24 -07:00
Andrew Hsieh
84efd3564b
Merge "Fixed to #include correct 32-bit headers"
2012-03-28 19:23:51 -07:00
Andrew Hsieh
1a94764ca2
Merge "ndk: Add MIPS Platform files which contain C runtime headers and sources of crt* assembler files"
2012-03-28 18:18:15 -07:00
Ying Wang
63dda881c2
Merge "Support to generate screen rotation events."
2012-03-28 18:12:00 -07:00
Teng-Hui Zhu
4978c1606c
Merge "Multiple webviews could be a bad model for developers to follow."
2012-03-28 16:29:57 -07:00
Teng-Hui Zhu
e46673a0a7
Multiple webviews could be a bad model for developers to follow.
...
bug:6206492
Change-Id: Ib650dbd74b5a00e6e373db74afe7cad242538a9b
2012-03-28 16:09:21 -07:00
Alex Sakhartchouk
77fc81a847
Merge "Moving libRS"
2012-03-28 15:08:59 -07:00
Alex Sakhartchouk
a2a466903f
Moving libRS
...
Change-Id: I53042e4a61468e43a02321cd512bda0c7882ea43
2012-03-28 14:21:18 -07:00
Raphael Moll
6b65c84656
resolved conflicts for merge of 7f45b2e9 to master
...
Explanation of conflict:
- I did modify master a while go to support new
source_prop_template files.
- That CL was then manually merged into master-aosp
and then auto-merged back to master.
- The template files were already in master.
- But the master version had 1 extra new line in each
(to add gpu support).
- Thus conflict. CQFD.
Change-Id: I0a04a0239fabbdc5349e197af4531a5ea6b2ff76
2012-03-28 11:53:42 -07:00
Raphael Moll
7f45b2e940
am 3f625090: am 75d9cabc: resolved conflicts for merge of fe2da416 to stage-aosp-master
...
* commit '3f6250907c3dd53830e34d54200bbd94845f1f31':
Merge SDK support for source.properties templates.
2012-03-28 11:40:06 -07:00
Raphael Moll
3f6250907c
am 75d9cabc: resolved conflicts for merge of fe2da416 to stage-aosp-master
...
* commit '75d9cabc8e921398561fdb8008ffb50c33592b38':
Merge SDK support for source.properties templates.
2012-03-28 11:38:08 -07:00
Raphael Moll
75d9cabc8e
resolved conflicts for merge of fe2da416 to stage-aosp-master
...
Change-Id: I70924f6d51e2c790314a2f34ae7c33935a72bda6
2012-03-28 11:05:45 -07:00
Raphael Moll
fe2da416d8
Merge "Merge SDK support for source.properties templates."
2012-03-27 19:06:23 -07:00
Eino-Ville Talvala
d6a3832650
Update emulated camera to support HAL v2.0 modules and devices.
...
- Update camera HAL module to version 2
- Break out common camera HAL device functionality into
EmulatedBaseCamera
- EmulatedCamera is now the base class for all version 1 camera
devices.
- No camera device version 2 implementation included.
No change to supported functionality.
Change-Id: Iabb0b9a4e41f3c01dfd921256fa8fb1d40d71834
2012-03-27 16:40:12 -07:00
Raghu Gandham
a8a0638b9e
ndk: Add MIPS Platform files which contain C runtime headers
...
and sources of crt* assembler files
Change-Id: I10547e8b589d36a7937a0833d86d4406a232aa2c
Signed-off-by: Raghu Gandham <raghu@mips.com >
2012-03-27 15:45:08 -07:00
Raphael Moll
f413515f16
Merge SDK support for source.properties templates.
...
Requires build.git change Ib36928097
Change-Id: Ida0c471fe166a1388584f2cf2250e07040ed0e55
2012-03-27 11:59:06 -07:00
Raphael Moll
a85a93fdb0
SDK: correctly zip sources.zip package.
...
When building the sources.zip for the SDK Repository,
the --exec-zip argument seems to be have been lost with
recent merges. Without this flag, the sources.zip is
not valid on some platforms.
Change-Id: I589df3d6df7890e0fccf568a03a76e6985ecb534
2012-03-27 10:49:58 -07:00
Ying Wang
46b674174b
Support to generate screen rotation events.
...
Bug: 6086016
Use "--pct-rotation <percentage>" to set the percentage.
Change-Id: If16fac45399ad50b25e211f2788a02fdc03c44b4
2012-03-27 10:28:00 -07:00
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