Commit Graph

8579 Commits

Author SHA1 Message Date
Raghu Gandham
ae9a5f960c [MIPS] Import signal.h from bionic. This version fixes the
warning emitted by the toolchain
2012-05-02 18:46:58 -07:00
Trevor Johns
b2c1343d41 Merge "Changes in some of the Android samples to support Google TV" 2012-05-01 13:02:01 -07:00
Kartic Grover
08bbdb6b21 Changes in some of the Android samples to support Google TV
Made changes in manifest files for 3 Android samples, namely ActionBarCompat, BackupRestore and CrossCompatibility for supporting Google TV devices. Changes related to making touchscreen support as optional and adding support for large screen devices was added.

Change-Id: Ie49b6fe94d750304b249b154b4bd9dffc3f789ee
2012-04-25 16:52:12 -07:00
Raphael Moll
424c95da4b Merge "SDK: Update sdk product library dependency list" 2012-04-25 15:07:43 -07:00
Raphael Moll
a70fac3d09 Merge "SDK: update product sdk.mk" 2012-04-25 10:23:13 -07:00
Raphael Moll
feaa5e8fbe SDK: Update sdk product library dependency list
Change-Id: I4830e7eac1192360a0a9850f763f98063b2c266f
2012-04-24 17:01:20 -07:00
Raphael Moll
fa6183c396 SDK: update product sdk.mk
The target/product/sdk.mk was split out of build.git.
Now this moves a few dependencies that were listed into the sdk.git
version of this file by mistake. Also sort the entries to be more
readable.

Change-Id: I652bca2b0322e9e8efd4bf2d5d9fcfd6c86d9c6c
2012-04-24 16:30:39 -07:00
Raphael Moll
6a04b5bb4e Merge "Support for Windows SDK pre-requisite module list." 2012-04-23 14:26:53 -07:00
Raphael Moll
3fb225fbfd Support for Windows SDK pre-requisite module list.
Requires sdk.git change I08fc98f2e1

Change-Id: I7388d7292d175ceac221ce6790655b37f85e8a32
2012-04-23 13:16:16 -07:00
Raphael Moll
186f007a74 Merge "Split build/targets/product/sdk.mk" 2012-04-23 09:48:51 -07:00
Raphael Moll
01d30e1a87 Split build/targets/product/sdk.mk
Change-Id: I6bbc6644a1dbf19ac768c2ea65d0e383b5dd23ef
2012-04-20 14:19:51 -07:00
Andrew Hsieh
bdd8dd7d1f Merge "Fixed compilation error #include <android/*h>" 2012-04-20 00:52:04 -07:00
Andrew Hsieh
d0e65433d0 Fixed compilation error #include <android/*h>
Fixed compilation error when header in #include <android/*h> is
included alone.

Fix for rect.h already exists in $ANDROID/frameworks/native/include/android

Change-Id: I7c49e044507581c5ad591f26f99cda6870b411c5
2012-04-20 15:50:10 +08:00
Xavier Ducrohet
2fa7b9ffeb Merge "Move emulator GLES from development.git to sdk.git" 2012-04-18 12:14:25 -07:00
Jesse Hall
80d4ba7716 Move emulator GLES from development.git to sdk.git
The emulator GLES support has two interfaces: a host shared library
interface used by QEMU, and a protocol between the platform and the
host. The host library interface is not versioned; QEMU and the GLES
renderer must match. The protocol on the other hand must be backwards
compatible: a new GLES renderer must support an older platform image.

Thus for branching purposes it makes more sense to put the GLES
renderer in sdk.git, which is branched along with qemu.git for SDK
releases. Platform images will be built against the protocol version
in the platform branch of sdk.git.

Change-Id: Ie73fce12815c9740e27d0f56caa53c6ceb3d30cc
2012-04-18 06:26:17 -07:00
Andrew Hsieh
46ead86b02 Merge "Refresh development/ndk/platforms/android-9/arch-x86/include/machine" 2012-04-05 22:30:09 -07:00
Andrew Hsieh
dab6072046 Refresh development/ndk/platforms/android-9/arch-x86/include/machine
Apply changes in bionic/libc/arch-x86/include/machine to
development/ndk/platforms/android-9/arch-x86/include/machine:

   commit 5fbf2e09921723cfdea75e83c1fac2080f0ad564

Change-Id: Ie0fe711ae4c866d9c1300430d5e9613ccb82da22
2012-04-06 13:29:08 +08:00
Xavier Ducrohet
2a57c79366 Merge "Move stuff from prebuilt to prebuilts/tools" 2012-04-04 13:02:37 -07:00
Xavier Ducrohet
40525ef472 Move stuff from prebuilt to prebuilts/tools
Also move some atree copy to sdk.git where they belong.

Change-Id: Iab62343806917f24f47d15b9dea75e44422d8764
2012-04-03 16:33:35 -07:00
Andrew Hsieh
34ccdaa87b Merge "ndk: ANativeActivity: Fix 'clazz' member documentation." 2012-04-03 04:32:21 -07:00
David 'Digit' Turner
16c0f25354 ndk: ANativeActivity: Fix 'clazz' member documentation.
As discussed on android-ndk, the member is misnamed

Change-Id: I2a5a1c8dce327ddf9ab7a4d14f4e2fdf62808753
2012-04-03 19:30:08 +08:00
Andrew Hsieh
9487df9a0f Merge "Remove auto-gen project.properties" 2012-04-02 03:36:57 -07:00
Andrew Hsieh
3f59495d17 Remove auto-gen project.properties
It's auto-gen by tool from default.properties in the same dir, etc.

Change-Id: I081ecb809699d42b707218b08e61b97fc9a51f1a
2012-04-02 18:32:04 +08:00
Andrew Hsieh
2bbd700ef6 Merge "ndk: <dlfcn.h>: dladdr() takes a 'const void*' parameter, not 'void*'" 2012-04-02 03:16:37 -07:00
David 'Digit' Turner
b2f20362ac ndk: <dlfcn.h>: dladdr() takes a 'const void*' parameter, not 'void*'
This is a back-port to API level 8 of a non-ABI-breaking change of the declaration.
2012-04-02 18:15:50 +08:00
Andrew Hsieh
48aaee2cd0 Merge "Native media sample app for NDK API level 14" 2012-04-02 03:13:45 -07:00
Glenn Kasten
00038deedc Native media sample app for NDK API level 14 2012-04-02 18:08:03 +08:00
Andrew Hsieh
2c10ade96c Merge "ndk: android-9: Add missing <sys/eventfd.h> header" 2012-04-02 03:06:50 -07:00
David 'Digit' Turner
e43487b854 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
2012-04-02 18:05:57 +08:00
Andrew Hsieh
ea94d94a3b Merge "ndk: <signal.h>: Increase _NSIG definition to 64" 2012-04-02 03:03:52 -07:00
David 'Digit' Turner
ef0d31ec73 ndk: <signal.h>: Increase _NSIG definition to 64
This is a minor update to this NDK header to better match the upstream definition.
2012-04-02 18:03:00 +08:00
Andrew Hsieh
535478dd4d Merge "ndk: <pthread.h>: formatting + updates" 2012-04-02 03:01:46 -07:00
David 'Digit' Turner
015d0543d2 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

Change-Id: Ib093058e8d7a7554d8329a40e102cde11d065932
2012-04-02 17:59:26 +08:00
Andrew Hsieh
5f37cda9b9 Merge "ndk: <unistd.h>: minor cleanup" 2012-04-02 02:56:37 -07:00
David 'Digit' Turner
002d5366b6 ndk: <unistd.h>: minor cleanup
- Cleanup declaration of lseek64() to use off64_t instead of loff_t
- Cleanup declaration of prctl() to use variable number of arguments

The cleanups are performed to better match upstream.

Change-Id: I3c9420e328c3772bbb57dc9108dc879aa698a981
2012-04-02 17:54:27 +08:00
Andrew Hsieh
3e7f4c62a2 Merge "ndk: <sys/cdefs.h> minor update" 2012-04-02 02:42:37 -07:00
David 'Digit' Turner
3da072d28f 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)
2012-04-02 17:41:16 +08:00
Andrew Hsieh
7ae589ca49 Merge "ndk: minor header update" 2012-04-02 01:08:05 -07:00
David 'Digit' Turner
1fe0de682b ndk: minor header update
<net/ethernet.h>: new header
<netdb.h>: add EAI_ADDRFAMILY definition
2012-04-02 16:07:07 +08:00
Andrew Hsieh
61e72dbc24 Merge "ndk: Fix ipv6 related headers" 2012-04-02 01:05:31 -07:00
David 'Digit' Turner
f4e62ff4a3 ndk: Fix ipv6 related headers
This fixes two minor issues with recent updates to the IPv6 related headers:

- add missing <linux/ipv6.h> kernel header
- avoid conflict in netinet/in6.h, the macro is already defined by <linux/in6.h>
2012-04-02 16:04:42 +08:00
Andrew Hsieh
ad05e868b8 Merge "ndk: Fix <sys/atomics.h> declarations." 2012-04-02 01:01:39 -07:00
David 'Digit' Turner
6c32dacf97 ndk: Fix <sys/atomics.h> declarations.
The atomic operations exported by the platform's C library do not
provide full memory barriers. This can result in incorrect results
when NDK machine code linked against them runs on multi-core devices.

While the bug has been fixed in the platform, this NDK header change
ensures that any source code that includes <sys/atomics.h> will end
up using a correct implementation of these functions, based on the
corresponding GCC builtins.

These builtins always provide a full barrier and have reasonable
performance. Application developers who depend on <sys/atomics.h>
should recompile their unmodified sources against this version
of the NDK as soon as possible.
2012-04-02 15:59:46 +08:00
Andrew Hsieh
26f8b53930 Merge "ndk: minor update to <netinet/...> headers." 2012-04-02 00:56:56 -07:00
David 'Digit' Turner
5704b40d70 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.
2012-04-02 15:31:20 +08:00
Andrew Hsieh
ee8746daba Merge "ndk: libc: Add RLIM_RTTIME to <asm-generic/resource.h>" 2012-04-02 00:15:32 -07:00
David 'Digit' Turner
554c5eca78 ndk: libc: Add RLIM_RTTIME to <asm-generic/resource.h>
This is a back-port of a fix that was performed in 4.0.1 to all previous platforms.
2012-04-02 15:14:10 +08:00
Andrew Hsieh
3211c04af1 Merge "ndk: arm: Update <asm/ptrace.h> and <asm/user.h>" 2012-04-02 00:12:14 -07:00
David 'Digit' Turner
34c6c855bc ndk: arm: Update <asm/ptrace.h> and <asm/user.h>
This is a minor update to two ARM-specific kernel headers.

- <asm/ptrace.h>: Add two new constants
- <asm/user.h>: Add 'struct vfp_user' and 'struct vfp_user_exc'
2012-04-02 15:11:02 +08:00
Andrew Hsieh
a9adb11aae Merge "ndk: disable logs in release builds of native_app_glue library." 2012-04-02 00:08:08 -07:00