David 'Digit' Turner
bea05255de
ndk: <sys/cdefs.h> minor update
...
This patch fixes some formatting issues in <sys/cdefs.h>:
- change '#if __STDC_VERSION__ > xxx' into '#if defined(__STDC_VERSION__) && __STDC_VERSION > xxx'
- add __LIBC_HIDDEN__ definition (not technically required, but makes comparing the headers with upstream easier)
Change-Id: I5fd13224181e2f757fb01cb99c93508c3a6d9e13
2012-01-11 11:29:10 +01:00
David 'Digit' Turner
e4f252821e
ndk: <pthread.h>: formatting + updates
...
This patch improves the formatting of <pthread.h> as exposed by the NDK:
- change '#if __cplusplus' into '#ifdef __cplusplus'
- change C++-style comment into C-style comment
It also adds pthread_atfork() for API level 11 (3.0)
Change-Id: Ie814208335ed102d4c178a4c373e6963e5dcc9dd
2012-01-11 11:29:10 +01:00
David 'Digit' Turner
42dddab4d6
ndk: minor header update
...
<net/ethernet.h>: new header
<netdb.h>: add EAI_ADDRFAMILY definition
Change-Id: Ib29d28adcde6fdb5167d3b7b05913ef2eed22412
2012-01-11 11:29:10 +01:00
David 'Digit' Turner
15af16fdf2
ndk: minor update to <netinet/...> headers.
...
This patch contains a minor update to the netinet headers from the C library.
Most of the changes come from later platform release, but can be safely back-ported
to previous API levels since they don't change the ABI:
- <netinet/icmp6.h>, <netinet/ip6.h>: new headers
- <netinet/in.h>: now always include <linux/ipv6.h> by default
- <netinet/in6.h>: add macros: IN6_IS_ADDR_ULA, IN6ADDR_LOOPBACK_INIT
- <netinet/ip.h>: add macro: IPTOS_MINCOST
- <net/if_ether.h>: always include <sys/types.h> by default.
Change-Id: Icaf38205389d2b49f0e9235c07df752da01a0167
2012-01-11 11:29:10 +01:00
David 'Digit' Turner
e0ff98803f
ndk: android-9: Add missing <sys/eventfd.h> header
...
For some reason, the header was missing from previous NDK releases.
Note: the function symbols are properly listed in arch-$ARCH/symbols/libc.so.functions.txt
Change-Id: I72bf307ccaf55c9b8fc344f5bbfa7b44ba673d62
2012-01-11 11:29:10 +01:00
Dianne Hackborn
174f61c0e9
Fix notification sample to follow current UI guidelines.
...
Lots of clean up on the messaging notification sample to show the real
correct way to do things. Also mark up a bunch of the sample for use
in the documentation.
Change-Id: I3a29a944c2971e142c33b29aff94b1ba0b40ae0e
2012-01-10 15:53:32 -08:00
Adam Powell
c7cbf9351a
am 30e2c473: Merge "Catch IOException for close"
...
* commit '30e2c473e896af55fb14a03e99d0841d2753da8d':
Catch IOException for close
2012-01-10 14:46:39 -08:00
Steve Block
3ba6e9ff86
am 7d47e557: Merge "Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE"
...
* commit '7d47e557172d15fb698604a48f1a0100dfd84330':
Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE
2012-01-10 14:46:33 -08:00
Adam Powell
30e2c473e8
Merge "Catch IOException for close"
2012-01-10 14:11:49 -08:00
Steve Block
7d47e55717
Merge "Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE"
2012-01-10 14:08:30 -08:00
Adam Powell
e882d4c266
Catch IOException for close
...
Change-Id: I23115f6fa4f54fd4e1de59f3bb781dcf28e1371b
2012-01-10 14:07:23 -08:00
Adam Powell
294d526e11
am 87376a45: Merge "Add code sample for ShareCompat"
...
* commit '87376a45e4782f81710655bbacfe95c9212a5ebe':
Add code sample for ShareCompat
2012-01-10 13:32:39 -08:00
Adam Powell
87376a45e4
Merge "Add code sample for ShareCompat"
2012-01-10 13:31:09 -08:00
Brian Muramatsu
854ab1ec1d
am cc90809c: Merge "Fix runtest for CTS Tests"
...
* commit 'cc90809c261dea1764bd6f8cd4455add6f6b1797':
Fix runtest for CTS Tests
2012-01-10 12:28:38 -08:00
Brian Muramatsu
cc90809c26
Merge "Fix runtest for CTS Tests"
2012-01-10 12:27:23 -08:00
Brian Muramatsu
95cbc9e1ec
Fix runtest for CTS Tests
...
The CTS packages use CTS-specific Makefiles rules like
BUILD_CTS_PACKAGE instead of BUILD_PACKAGE. Update runtest
to include CtsBuild.mk which defines all of these.
Change-Id: I6ea6c77b4f2ab113126319141e5120e016055c9d
2012-01-10 12:06:12 -08:00
Jean-Baptiste Queru
8315e4bce5
am 86034fd4: am a93b8f1d: am b8cc9bcd: am e4ee58f3: Reference kernels in new location
...
* commit '86034fd49646d1120faf6852cfb2826a2f1d72a1':
Reference kernels in new location
2012-01-10 09:03:43 -08:00
Jesse Hall
1f30075c7f
am 56335392: am d23522e6: am f0baef2f: Merge "EmuGL: misc small cleanups" into ics-mr1
...
* commit '5633539268af0c8686ce97c174122e053ecbb774':
EmuGL: misc small cleanups
2012-01-10 09:02:49 -08:00
Jesse Hall
90f9afea71
am 8a5b5242: am 19b03e4e: am 409c49c5: Merge "EmuGL: fix GL view position in window on OS X" into ics-mr1
...
* commit '8a5b5242a4cf4e5be85f9e5fed1787027d92704b':
EmuGL: fix GL view position in window on OS X
2012-01-10 09:02:48 -08:00
The Android Automerger
f5c5d8153b
merge in ics-release history after reset to master
2012-01-10 06:59:30 -08:00
Jean-Baptiste Queru
86034fd496
am a93b8f1d: am b8cc9bcd: am e4ee58f3: Reference kernels in new location
...
* commit 'a93b8f1d6dd52679d3c6a2ddffdb018406047364':
Reference kernels in new location
2012-01-09 17:53:46 -08:00
Jean-Baptiste Queru
a93b8f1d6d
am b8cc9bcd: am e4ee58f3: Reference kernels in new location
...
* commit 'b8cc9bcda92f4afbcaf654dae6ce51e19a1972b1':
Reference kernels in new location
2012-01-09 17:51:33 -08:00
Jean-Baptiste Queru
b8cc9bcda9
am e4ee58f3: Reference kernels in new location
...
* commit 'e4ee58f3cb786dca4efccb090428a4429cc751c9':
Reference kernels in new location
2012-01-09 17:49:23 -08:00
Jesse Hall
5633539268
am d23522e6: am f0baef2f: Merge "EmuGL: misc small cleanups" into ics-mr1
...
* commit 'd23522e614c517a50222796286a7fffb6c11bd14':
EmuGL: misc small cleanups
2012-01-09 16:37:28 -08:00
Jesse Hall
8a5b5242a4
am 19b03e4e: am 409c49c5: Merge "EmuGL: fix GL view position in window on OS X" into ics-mr1
...
* commit '19b03e4ef1e7861b938dd7c52356af5396f456b3':
EmuGL: fix GL view position in window on OS X
2012-01-09 16:37:27 -08:00
Jesse Hall
def31e890f
am f0baef2f: Merge "EmuGL: misc small cleanups" into ics-mr1
...
* commit 'f0baef2fed555e87a0910e5aab6b8b763487b350':
EmuGL: misc small cleanups
2012-01-09 15:53:56 -08:00
Jesse Hall
c732d40825
am 409c49c5: Merge "EmuGL: fix GL view position in window on OS X" into ics-mr1
...
* commit '409c49c526508b5fa36f8bc6edc1fc70cba5a3e1':
EmuGL: fix GL view position in window on OS X
2012-01-09 15:53:55 -08:00
Jesse Hall
d23522e614
am f0baef2f: Merge "EmuGL: misc small cleanups" into ics-mr1
...
* commit 'f0baef2fed555e87a0910e5aab6b8b763487b350':
EmuGL: misc small cleanups
2012-01-09 15:53:49 -08:00
Jesse Hall
19b03e4ef1
am 409c49c5: Merge "EmuGL: fix GL view position in window on OS X" into ics-mr1
...
* commit '409c49c526508b5fa36f8bc6edc1fc70cba5a3e1':
EmuGL: fix GL view position in window on OS X
2012-01-09 15:53:48 -08:00
Jesse Hall
f0baef2fed
Merge "EmuGL: misc small cleanups" into ics-mr1
2012-01-09 15:52:15 -08:00
Jesse Hall
409c49c526
Merge "EmuGL: fix GL view position in window on OS X" into ics-mr1
2012-01-09 15:51:40 -08:00
Jean-Baptiste Queru
1c6e5773c4
am 1c4a74c9: Merge "Reference kernels in new location"
...
* commit '1c4a74c9eb291d67b69d1696470f77fe67abfd28':
Reference kernels in new location
2012-01-09 15:34:01 -08:00
Steve Block
8ad367c36d
Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE
...
See https://android-git.corp.google.com/g/157519
Bug: 5449033
Change-Id: I2eb298dae73ccfd8e9ee8350344d9f5c96f5c422
2012-01-09 21:35:44 +00:00
Jean-Baptiste Queru
e4ee58f3cb
Reference kernels in new location
...
Change-Id: Ic2eae2fef0900e8a8f74cff00e427b99c970f036
2012-01-09 12:09:01 -08:00
Jean-Baptiste Queru
1c4a74c9eb
Merge "Reference kernels in new location"
2012-01-09 12:03:56 -08:00
Steve Block
9033d6efcf
am 5a622cba: Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
...
* commit '5a622cba8c5287d5e6577f940a22343a7cae977f':
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
2012-01-09 11:22:47 -08:00
Jean-Baptiste Queru
07ffdd5c31
Reference kernels in new location
...
Change-Id: Ic2eae2fef0900e8a8f74cff00e427b99c970f036
2012-01-09 10:57:13 -08:00
The Android Automerger
b0ae70dd4e
merge in ics-release history after reset to master
2012-01-09 06:59:34 -08:00
Steve Block
5a622cba8c
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
...
See https://android-git.corp.google.com/g/#/c/157220
Bug: 5449033
Change-Id: Ic6cac56d137f705dfa7266f21e9b0269219bd5d1
2012-01-09 10:39:43 +00:00
The Android Open Source Project
79d7709fc9
am 2a184c2c: am 98e5d57a: Reconcile with ics-mr1-release
...
* commit '2a184c2ce5d1a64665607f2f17a689968be826cb':
2012-01-07 00:42:04 -08:00
The Android Open Source Project
2a184c2ce5
am 98e5d57a: Reconcile with ics-mr1-release
...
* commit '98e5d57aa95640f5e6ee282067cc994f3ea4dd46':
2012-01-06 18:16:28 -08:00
The Android Open Source Project
98e5d57aa9
Reconcile with ics-mr1-release
...
Change-Id: Ide3a3c13469bf86114acbe443efe02f5b86743b8
2012-01-06 18:14:59 -08:00
The Android Automerger
0bd79f4b43
merge in ics-mr1-release history after reset to ics-mr1
2012-01-06 16:31:26 -08:00
Katie McCormick
f741c05f0c
Doc change: updated index page for HDP sample.
...
Change-Id: I06a6af5bdfac9a260ca053dd11030631e49c2509
2012-01-06 12:45:32 -08:00
Steve Block
8460b530e8
am 8e822bd4: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE"
...
* commit '8e822bd462aff69821442a02b85ed9c5dcbed341':
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE
2012-01-06 10:33:19 -08:00
Steve Block
8e822bd462
Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE"
2012-01-06 10:30:47 -08:00
David 'Digit' Turner
75dee9a4f7
am b620cf22: Merge "ndk: disable logs in release builds of native_app_glue library."
...
* commit 'b620cf22eb2fc4fc44da51632413a33d3d444d87':
ndk: disable logs in release builds of native_app_glue library.
2012-01-06 04:10:06 -08:00
David 'Digit' Turner
b620cf22eb
Merge "ndk: disable logs in release builds of native_app_glue library."
2012-01-06 04:07:47 -08:00
Steve Block
6aff44c27e
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE
...
See https://android-git.corp.google.com/g/157065
Bug: 5449033
Change-Id: I03c41e20d8f5d7f3c7ef1f01506885e3e250e921
2012-01-06 10:06:41 +00:00
Roman Nurik
09c6c3c83f
am 32bbde6c: am 37340765: am 5621efe1: docs: Allow d.a.c. to serve .OGV
...
* commit '32bbde6c5d235c965c05c0bbc554497e31b01974':
docs: Allow d.a.c. to serve .OGV
2012-01-05 16:43:29 -08:00