Commit Graph

8532 Commits

Author SHA1 Message Date
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
David 'Digit' Turner
e938d97d6b ndk: disable logs in release builds of native_app_glue library.
This patch disables all the logs from the 'native_app_glue' helper
library (used to implement native activities with the NDK), unless
you're building a debug build.
2012-04-02 15:06:11 +08:00
Andrew Hsieh
ac1d40cf4f Merge "Fixed inconsistent minSdkVersion and target= in NDK samples" 2012-04-02 00:00:56 -07:00
Andrew Hsieh
a79e56e2f8 Fixed inconsistent minSdkVersion and target= in NDK samples
Also removed Dummy.java and auto-gen files
Inspired by http://code.google.com/p/android/issues/detail?id=20017
2012-04-02 15:00:03 +08:00
Andrew Hsieh
7a17a9aff7 Merge "Fixed to #include correct 32-bit headers" 2012-04-01 23:38:27 -07:00
Andrew Hsieh
0523af7ca2 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
2012-04-02 14:35:36 +08: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
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
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
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
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
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
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
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
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
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
Andrew Hsieh
fd3b518f75 am 9e3e95f6: am 76780669: Added rules to build 64-bit libraries for 64-bit emulator
* commit '9e3e95f65fa8415c38a10caa3f211b9b9f896df5':
  Added rules to build 64-bit libraries for 64-bit emulator
2012-03-22 13:30:15 -07:00
Jean-Baptiste Queru
79977b408b am 8d2f79ba: Merge "SDK: generate repo using latest schemas when available."
* commit '8d2f79ba939e0394cf18489503a6f2a3ebcce8f6':
  SDK: generate repo using latest schemas when available.
2012-03-22 13:27:44 -07:00
Andrew Hsieh
9e3e95f65f am 76780669: Added rules to build 64-bit libraries for 64-bit emulator
* commit '76780669f9867587693563358ccdc903e9cdcbba':
  Added rules to build 64-bit libraries for 64-bit emulator
2012-03-22 13:27:43 -07:00
Jean-Baptiste Queru
5ec7bda1f5 am 40b67a0e: Merge 8aafafe4
* commit '40b67a0eb0ae7c612dd30611121cf3c655c49793':
  Fixed crash and 64-bit porting issues
2012-03-22 13:01:06 -07:00
Jean-Baptiste Queru
40b67a0eb0 Merge 8aafafe4
Change-Id: I41f097b5b96c4d000b1748b9e0411497d323556a
2012-03-22 12:57:54 -07:00
Jean-Baptiste Queru
8d2f79ba93 Merge "SDK: generate repo using latest schemas when available." 2012-03-22 12:54:17 -07:00
Andrew Hsieh
76780669f9 Added rules to build 64-bit libraries for 64-bit emulator
All ten libraries can now be built in 64-bit named "lib64*" (*)
in addition to the original 32-bit form named "lib*".

Also, dlopen "lib64*so" in 64-bit.

(*) eg. In Ubuntu, all can be built with the following command:
  make out/host/linux-x86/lib/lib64OpenglRender.so \
       out/host/linux-x86/lib/lib64EGL_translator.so \
       out/host/linux-x86/lib/lib64GLES_CM_translator.so \
       out/host/linux-x86/lib/lib64GLES_V2_translator.so

Rules to build static libraries lib64log.a, lib64cutils.a and lib64utils.a
they depend were added in other CLs.

Change-Id: I3afb64de6dda1d55dbd1b4443d2dbc78a683b19f
2012-03-22 12:36:45 -07:00
Andrew Hsieh
8aafafe4bd Fixed crash and 64-bit porting issues
1. "emugen" generates four *dec.cpp files containing code like this
   to decode offset to pointer in stream

   tmp = *(T *)(ptr + 8 + 4 + 4 + 4 + *(size_t *)(ptr +8 + 4 + 4));

   If *dec.cpp are compiled in 64-bit, size_t is 8-byte and dereferencing of
   it is likley to get wild offset for dereferencing of *(T *) to crash the
   code.  Solution is to define tsize_t for "target size_t" instead
   of using host size_t.

2. Cast pointer to "uintptr_t" instead of "unsigned int" for 2nd param of
   ShareGroup::getGlobalName(NamedObjectType, ObjectLocalName/*64bit*/).
3. Instance of EGLSurface, EGLContext and EGLImageKHR are used as 32-bit
   key for std::map< unsigned int, * > SurfacesHndlMap, ContextsHndlMap,
   and ImagesHndlMap, respectively.  Cast pointer to uintptr_t and assert
   upper 32-bit is zero before passing to map::find().
4. Instance of GLeglImageOES is used to eglAttachEGLImage() which expect
   "unsigned int".  Cast it to uintptr_t and assert upper 32-bit is zero.
5. The 5th param to GLEScontext::setPointer is GLvoid* but contains 32-bit
   offset to vbo if bufferName exists.  Cast it to uintptr_t and assert
   upper 32-bit is zero.
6. Use %zu instead of %d to print size_t
7. Cast pointer to (uintptr_t) in many other places

Change-Id: Iba6e5bda08c43376db5b011e9d781481ee1f5a12
2012-03-22 11:10:31 -07:00
Raphael Moll
8f7e1f7a95 SDK: generate repo using latest schemas when available.
This generates a repository in either v5 or v6 and adjusts
the name/vendor attributes accordingly.

This extracts the support extra in a separate 'repo-extras.xml'
which has an addon.xsd type instead of being a repository.xsd.

Requires sdk.git change Ib0363f06 to build properly.

Change-Id: I250fe7a3ec0dfa490778ae747a1a8f4e536bb395
2012-03-21 19:08:11 -07:00
Xavier Ducrohet
3280e9480f am 37bae214: Add flag indicating gpu support in emulator system image.
* commit '37bae214eed57ab4b9908fb07a6be3c0f8bf141b':
  Add flag indicating gpu support in emulator system image.
2012-03-21 16:48:17 -07:00
Xavier Ducrohet
37bae214ee Add flag indicating gpu support in emulator system image.
Change-Id: I21040f50f8e95b389c1e6db2de93654be6da6f7e
2012-03-21 16:44:12 -07:00
The Android Open Source Project
cbd78651ba Reconcile with ics-mr1-release
Change-Id: I01fb273b93fb7adff59608eb6b7d8395149e3cc0
2012-03-21 08:22:54 -07:00
The Android Automerger
885cc0e7d4 merge in ics-mr1-release history after reset to ics-mr1 2012-03-16 19:31:09 -07:00
Xavier Ducrohet
024201a3b3 am a205c3ad: Merge "Add eclipse+readme files to prebuilt of v7-grid. do not merge." into ics-mr1
* commit 'a205c3ad2a8102d8ba681ad358cd3470bc237be6':
  Add eclipse+readme files to prebuilt of v7-grid. do not merge.
2012-03-16 09:42:25 -07:00
Xavier Ducrohet
a205c3ad2a Merge "Add eclipse+readme files to prebuilt of v7-grid. do not merge." into ics-mr1 2012-03-16 09:40:37 -07:00
Xavier Ducrohet
65b242b151 Add eclipse+readme files to prebuilt of v7-grid. do not merge.
Change-Id: Ife58a0f2abf8ee13c2973ff57b2aaedfd9d78d59
2012-03-16 09:39:57 -07:00
Raghu Gandham
c06e37eb51 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.)

    #define  WCHAR_MAX   INT_MAX
    #define  WCHAR_MIN   INT_MIN

Change-Id: Ifa87cf011cf7068c48755fc9ce5c0d73e95ef2dc
Signed-off-by: Chao-Ying Fu <fu@mips.com>
2012-03-15 17:24:23 -07:00
Robert Ly
b7875ba1d5 am 6630bfd9: Merge "update searchable dictionary for Android U class" into ics-mr1
* commit '6630bfd9ac3df7ee11c3b8e9abd4c1ee2b58fc17':
  update searchable dictionary for Android U class
2012-03-14 15:43:03 -07:00
Robert Ly
6630bfd9ac Merge "update searchable dictionary for Android U class" into ics-mr1 2012-03-14 15:40:41 -07:00