Commit Graph

10521 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
f2b917197e Merge "Fix Eclipse .classpath file for JB." 2012-08-20 10:06:11 -07:00
Eino-Ville Talvala
34a4d2d519 Emulator gralloc: Support YV12
Bug: 6243944
Change-Id: I5f416ab0ae15143df422c0f79d91841984b4fabe
2012-08-20 09:13:48 -07:00
The Android Automerger
3568ea4489 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-20 06:33:51 -07:00
Andrew Hsieh
bcc82c160e am 14f99f20: am 50b47c57: am b1dca78a: am 11489016: am 7f26cea9: Merge "Update stdint.h; Refresh <arch>/include/machine/* stdint.h: https://android-review.googlesource.com/#/c/41714/ https://android-review.googlesource.com/#/c/40576/ <arch>/include/mac
* commit '14f99f20fbcb0b11c49085ea5d39a86748363cf2':
  Update stdint.h; Refresh <arch>/include/machine/*   stdint.h: https://android-review.googlesource.com/#/c/41714/             https://android-review.googlesource.com/#/c/40576/   <arch>/include/machine/*: to be consistent with      bionic/libc/<arch>/include/machine/*
2012-08-20 05:43:35 -07:00
Andrew Hsieh
205f353a4a am cf7c2984: am 0209524b: am 6b92aee0: am bc95f91d: am e33ad352: Merge "Remove linux-unistd.h"
* commit 'cf7c2984a842079c42288112602d097c6dd1cd8e':
  Remove linux-unistd.h
2012-08-20 05:43:34 -07:00
Andrew Hsieh
d2587a2b9d am 204c5a96: am 07606f03: am 41f23731: am 7305bb53: am ed722f12: Merge "Replace link.h for mips with new version for all platforms"
* commit '204c5a96fbae96f02c52cea1aae480ba44789b01':
  Replace link.h for mips with new version for all platforms
2012-08-20 05:43:32 -07:00
Andrew Hsieh
14f99f20fb am 50b47c57: am b1dca78a: am 11489016: am 7f26cea9: Merge "Update stdint.h; Refresh <arch>/include/machine/* stdint.h: https://android-review.googlesource.com/#/c/41714/ https://android-review.googlesource.com/#/c/40576/ <arch>/include/machine/*: to be
* commit '50b47c5732b6049a2d619546507ccc03c446eed6':
  Update stdint.h; Refresh <arch>/include/machine/*   stdint.h: https://android-review.googlesource.com/#/c/41714/             https://android-review.googlesource.com/#/c/40576/   <arch>/include/machine/*: to be consistent with      bionic/libc/<arch>/include/machine/*
2012-08-20 05:42:11 -07:00
Andrew Hsieh
cf7c2984a8 am 0209524b: am 6b92aee0: am bc95f91d: am e33ad352: Merge "Remove linux-unistd.h"
* commit '0209524bd47351d43e0403d10ecd94c2c3464b0b':
  Remove linux-unistd.h
2012-08-20 05:42:10 -07:00
Andrew Hsieh
204c5a96fb am 07606f03: am 41f23731: am 7305bb53: am ed722f12: Merge "Replace link.h for mips with new version for all platforms"
* commit '07606f0324ecf0040df46cd02b2a00cfc5a302e7':
  Replace link.h for mips with new version for all platforms
2012-08-20 05:42:08 -07:00
Andrew Hsieh
50b47c5732 am b1dca78a: am 11489016: am 7f26cea9: Merge "Update stdint.h; Refresh <arch>/include/machine/* stdint.h: https://android-review.googlesource.com/#/c/41714/ https://android-review.googlesource.com/#/c/40576/ <arch>/include/machine/*: to be consistent w
* commit 'b1dca78a7403a1603edb6b0a993a33bb4d6478d2':
  Update stdint.h; Refresh <arch>/include/machine/*   stdint.h: https://android-review.googlesource.com/#/c/41714/             https://android-review.googlesource.com/#/c/40576/   <arch>/include/machine/*: to be consistent with      bionic/libc/<arch>/include/machine/*
2012-08-20 05:40:01 -07:00
Andrew Hsieh
0209524bd4 am 6b92aee0: am bc95f91d: am e33ad352: Merge "Remove linux-unistd.h"
* commit '6b92aee0021e677a861e1a420250516c42697518':
  Remove linux-unistd.h
2012-08-20 05:40:00 -07:00
Andrew Hsieh
07606f0324 am 41f23731: am 7305bb53: am ed722f12: Merge "Replace link.h for mips with new version for all platforms"
* commit '41f23731cb2414b2813d54f0401e0e5a7bb45521':
  Replace link.h for mips with new version for all platforms
2012-08-20 05:39:58 -07:00
Andrew Hsieh
b1dca78a74 am 11489016: am 7f26cea9: Merge "Update stdint.h; Refresh <arch>/include/machine/* stdint.h: https://android-review.googlesource.com/#/c/41714/ https://android-review.googlesource.com/#/c/40576/ <arch>/include/machine/*: to be consistent with bion
* commit '11489016437203d2539ed02410397b835bd03037':
  Update stdint.h; Refresh <arch>/include/machine/*   stdint.h: https://android-review.googlesource.com/#/c/41714/             https://android-review.googlesource.com/#/c/40576/   <arch>/include/machine/*: to be consistent with      bionic/libc/<arch>/include/machine/*
2012-08-20 05:37:59 -07:00
Andrew Hsieh
6b92aee002 am bc95f91d: am e33ad352: Merge "Remove linux-unistd.h"
* commit 'bc95f91d24b6238f3a56363468bfb3129eb7429b':
  Remove linux-unistd.h
2012-08-20 05:37:58 -07:00
Andrew Hsieh
41f23731cb am 7305bb53: am ed722f12: Merge "Replace link.h for mips with new version for all platforms"
* commit '7305bb5363804a5d08e8b489e8498a91c4bd7d47':
  Replace link.h for mips with new version for all platforms
2012-08-20 05:37:56 -07:00
Andrew Hsieh
1148901643 am 7f26cea9: Merge "Update stdint.h; Refresh <arch>/include/machine/* stdint.h: https://android-review.googlesource.com/#/c/41714/ https://android-review.googlesource.com/#/c/40576/ <arch>/include/machine/*: to be consistent with bionic/libc/<arch
* commit '7f26cea9049c087b0552fb0f364ab6142a1ad227':
  Update stdint.h; Refresh <arch>/include/machine/*   stdint.h: https://android-review.googlesource.com/#/c/41714/             https://android-review.googlesource.com/#/c/40576/   <arch>/include/machine/*: to be consistent with      bionic/libc/<arch>/include/machine/*
2012-08-20 05:36:04 -07:00
Andrew Hsieh
bc95f91d24 am e33ad352: Merge "Remove linux-unistd.h"
* commit 'e33ad3528d23349a01113289272ffeff08106cf7':
  Remove linux-unistd.h
2012-08-20 05:36:02 -07:00
Andrew Hsieh
7305bb5363 am ed722f12: Merge "Replace link.h for mips with new version for all platforms"
* commit 'ed722f1242d330bd3fe29ff0793e4c616190ef2d':
  Replace link.h for mips with new version for all platforms
2012-08-20 05:36:01 -07:00
Andrew Hsieh
7f26cea904 Merge "Update stdint.h; Refresh <arch>/include/machine/* stdint.h: https://android-review.googlesource.com/#/c/41714/ https://android-review.googlesource.com/#/c/40576/ <arch>/include/machine/*: to be consistent with bionic/libc/<arch>/include/machine/*" 2012-08-20 05:22:01 -07:00
Andrew Hsieh
e33ad3528d Merge "Remove linux-unistd.h" 2012-08-20 05:21:26 -07:00
Andrew Hsieh
ed722f1242 Merge "Replace link.h for mips with new version for all platforms" 2012-08-20 05:20:59 -07:00
Andrew Hsieh
61a3e1462c Update stdint.h; Refresh <arch>/include/machine/*
stdint.h: https://android-review.googlesource.com/#/c/41714/
            https://android-review.googlesource.com/#/c/40576/
  <arch>/include/machine/*: to be consistent with
     bionic/libc/<arch>/include/machine/*

Change-Id: Ieeb44c3e864bf64c4cad4d3c9d94024a7b520181
2012-08-20 18:32:15 +08:00
Pavel Chupin
51d4794277 Replace link.h for mips with new version for all platforms
Update from bionic/libc/include/link.h
For details see https://android-review.googlesource.com/#/c/41705

Change-Id: Ib9e658aa0606584b148e951ad199dc12c2f563c2
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2012-08-20 10:48:23 +04:00
Jeff Brown
900139e605 am 3eadba67: am f9fc2a56: Use new display manager API.
* commit '3eadba67786e6e44ae17d5f6531343d95133e27d':
  Use new display manager API.
2012-08-19 23:10:35 -07:00
Jeff Brown
3eadba6778 am f9fc2a56: Use new display manager API.
* commit 'f9fc2a56f18b5d9684b48f0fe7a4e3b24eab5847':
  Use new display manager API.
2012-08-19 23:08:28 -07:00
Jeff Brown
f9fc2a56f1 Use new display manager API.
Also deleted some dead code.

Change-Id: I4d070b6642caf2c143eeacceeb678c102e5da19c
2012-08-19 21:13:09 -07:00
Andrew Hsieh
db1c0d4bc6 am 851d9b25: (-s ours) am 0ea80e8a: am 1cca87b3: (-s ours) am f49ba834: (-s ours) am 1659906d: (-s ours) Merge "Retire LOCAL_NDK_VERSION (DO NOT MERGE)"
* commit '851d9b25e84e8df2f353cbb7326f44240ac6351c':
  Retire LOCAL_NDK_VERSION (DO NOT MERGE)
2012-08-18 01:23:31 -07:00
Andrew Hsieh
851d9b25e8 am 0ea80e8a: am 1cca87b3: (-s ours) am f49ba834: (-s ours) am 1659906d: (-s ours) Merge "Retire LOCAL_NDK_VERSION (DO NOT MERGE)"
* commit '0ea80e8a0f2f49c7a06c99d84d86d1b564f883a6':
  Retire LOCAL_NDK_VERSION (DO NOT MERGE)
2012-08-18 01:21:01 -07:00
Andrew Hsieh
0ea80e8a0f am 1cca87b3: (-s ours) am f49ba834: (-s ours) am 1659906d: (-s ours) Merge "Retire LOCAL_NDK_VERSION (DO NOT MERGE)"
* commit '1cca87b3239c3e0af7efd419a022784663779c9d':
  Retire LOCAL_NDK_VERSION (DO NOT MERGE)
2012-08-18 01:19:32 -07:00
Andrew Hsieh
1cca87b323 am f49ba834: (-s ours) am 1659906d: (-s ours) Merge "Retire LOCAL_NDK_VERSION (DO NOT MERGE)"
* commit 'f49ba8344b2de51bf1f96ea036248b1fad88627b':
  Retire LOCAL_NDK_VERSION (DO NOT MERGE)
2012-08-18 01:17:27 -07:00
Andrew Hsieh
f49ba8344b am 1659906d: (-s ours) Merge "Retire LOCAL_NDK_VERSION (DO NOT MERGE)"
* commit '1659906d5e6d59bcf823d6bb781e15846abfda9c':
  Retire LOCAL_NDK_VERSION (DO NOT MERGE)
2012-08-18 01:16:15 -07:00
Andrew Hsieh
7de8e93107 Remove linux-unistd.h
Change-Id: I95cc89bfacb05d92da658fa533cb75ac65d397bf
2012-08-18 16:08:51 +08:00
Andrew Hsieh
1659906d5e Merge "Retire LOCAL_NDK_VERSION (DO NOT MERGE)" 2012-08-18 01:04:19 -07:00
Andrew Hsieh
72b38e37cb am afdfce06: am 3a5c958c: am 171040c6: am bd37ac2e: Merge "Make sys/ioctl_compat.h portable."
* commit 'afdfce0645b410402a52458c54a6032f2f8becfc':
  Make sys/ioctl_compat.h portable.
2012-08-17 17:51:51 -07:00
Andrew Hsieh
afdfce0645 am 3a5c958c: am 171040c6: am bd37ac2e: Merge "Make sys/ioctl_compat.h portable."
* commit '3a5c958c175cca76867d3b8b6645bc6517cf9e1a':
  Make sys/ioctl_compat.h portable.
2012-08-17 17:50:35 -07:00
Andrew Hsieh
3a5c958c17 am 171040c6: am bd37ac2e: Merge "Make sys/ioctl_compat.h portable."
* commit '171040c6bd85293e352ba7a5e461b1b945223f0c':
  Make sys/ioctl_compat.h portable.
2012-08-17 17:48:25 -07:00
Andrew Hsieh
171040c6bd am bd37ac2e: Merge "Make sys/ioctl_compat.h portable."
* commit 'bd37ac2e42ff00e1bde14b00f0d68997210b27b4':
  Make sys/ioctl_compat.h portable.
2012-08-17 17:46:11 -07:00
Andrew Hsieh
bd37ac2e42 Merge "Make sys/ioctl_compat.h portable." 2012-08-17 17:38:04 -07:00
Andrew Hsieh
69697e6084 am d0c00c8d: am 27f08692: am f78ddc64: am d333a0d1: Merge "Update/Copy fenv.h"
* commit 'd0c00c8da42e16d583aa14fba6fb90a42f95f1ea':
  Update/Copy fenv.h
2012-08-17 17:34:31 -07:00
Andrew Hsieh
f7ecc81ca2 am 217e2502: am 6f0bea01: am 5ed8f17a: am f8e828d2: Merge "Add portable support for stuct statfs and two functions."
* commit '217e2502caea6fb480360c33bb74f5a0a3128def':
  Add portable support for stuct statfs and two functions.
2012-08-17 17:34:29 -07:00
Andrew Hsieh
d0c00c8da4 am 27f08692: am f78ddc64: am d333a0d1: Merge "Update/Copy fenv.h"
* commit '27f086928bc62ed5744c1f6c7b7f5dc8593a3d7c':
  Update/Copy fenv.h
2012-08-17 17:32:18 -07:00
Andrew Hsieh
217e2502ca am 6f0bea01: am 5ed8f17a: am f8e828d2: Merge "Add portable support for stuct statfs and two functions."
* commit '6f0bea016bc6091e209949b5cb028e0132cc19e8':
  Add portable support for stuct statfs and two functions.
2012-08-17 17:32:17 -07:00
Andrew Hsieh
27f086928b am f78ddc64: am d333a0d1: Merge "Update/Copy fenv.h"
* commit 'f78ddc649987b9f0e7d6a7328d54cd31099976ff':
  Update/Copy fenv.h
2012-08-17 17:30:45 -07:00
Andrew Hsieh
6f0bea016b am 5ed8f17a: am f8e828d2: Merge "Add portable support for stuct statfs and two functions."
* commit '5ed8f17a475f46897b00db43d3920a4420f21765':
  Add portable support for stuct statfs and two functions.
2012-08-17 17:30:43 -07:00
Andrew Hsieh
f78ddc6499 am d333a0d1: Merge "Update/Copy fenv.h"
* commit 'd333a0d1f8afd5dfd2afaff0079f22450bb0aa0d':
  Update/Copy fenv.h
2012-08-17 17:28:41 -07:00
Andrew Hsieh
5ed8f17a47 am f8e828d2: Merge "Add portable support for stuct statfs and two functions."
* commit 'f8e828d2d0cf1598968b8c93dc8627c9a8a99c7c':
  Add portable support for stuct statfs and two functions.
2012-08-17 17:28:40 -07:00
Andrew Hsieh
d333a0d1f8 Merge "Update/Copy fenv.h" 2012-08-17 17:17:08 -07:00
Andrew Hsieh
f8e828d2d0 Merge "Add portable support for stuct statfs and two functions." 2012-08-17 17:16:20 -07:00
Chao-Ying Fu
584ef7f14c Make sys/ioctl_compat.h portable.
Change-Id: Id9c4c68c8422d46d463b9c987be180ea50c05099
2012-08-17 17:11:23 -07:00
Chao-Ying Fu
64c217eb07 Add portable support for stuct statfs and two functions.
Change-Id: I1e34428574a11bedb3a5a35a45dc519fcae3cd03
2012-08-17 12:22:39 -07:00