Andrew Hsieh
a95b29a1b4
am 0e502601: am 2ead849b: am 0c5907b3: am 2f5fa0be: Merge "ndk: Fix wait4() declarations"
...
* commit '0e502601754db236780437c5fe9bd95b26a65936':
ndk: Fix wait4() declarations
2014-01-09 13:33:21 -08:00
Narayan Kamath
7a3759d4a8
am 10e82353: am 7d3b1cc2: am 4ebf0371: am 1e18a584: Merge "Whitelist libziparchive for windows."
...
* commit '10e82353220a477e014d24541c94338bf89922a9':
Whitelist libziparchive for windows.
2014-01-09 13:33:20 -08:00
George Mount
9d675bc04f
am 3dd963e5: Merge "Add Trim Path API demo."
...
* commit '3dd963e596e2ad84f5ea38cc248d172f800ebfd3':
Add Trim Path API demo.
2014-01-09 13:33:19 -08:00
Qiwen Zhao
0afedc0682
am 21657766: am a924e71c: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev
...
* commit '2165776685089613021f6ec6b34205d936dc2da1':
2014-01-09 13:33:18 -08:00
Qiwen Zhao
98f5f30db5
am a924e71c: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev
...
* commit 'a924e71c93511ac0ad5456ec3a1ca7dfd35f2c79':
2014-01-09 13:33:17 -08:00
Baligh Uddin
7639f8d7e6
am 44c0b09b: Remove deprecated locales
...
* commit '44c0b09b7b4961b04d5437e773c55fde78034d5e':
Remove deprecated locales
2014-01-09 13:33:11 -08:00
Qiwen Zhao
8a0d04b9f7
am 01bd07ca: (-s ours) am 5e84ff2c: (-s ours) snap to klp-dev-plus-aosp f57b1e0 with history
...
* commit '01bd07ca25199cbc588ec72e70074eb3f7f33b74':
2014-01-09 13:33:10 -08:00
Andrew Hsieh
0e50260175
am 2ead849b: am 0c5907b3: am 2f5fa0be: Merge "ndk: Fix wait4() declarations"
...
* commit '2ead849b894c976a25117c0c31cd76d3242f9933':
ndk: Fix wait4() declarations
2013-12-13 02:33:05 +00:00
Andrew Hsieh
2ead849b89
am 0c5907b3: am 2f5fa0be: Merge "ndk: Fix wait4() declarations"
...
* commit '0c5907b31ce1bbeda51770104785035fa62f6c41':
ndk: Fix wait4() declarations
2013-12-13 02:30:26 +00:00
Andrew Hsieh
0c5907b31c
am 2f5fa0be: Merge "ndk: Fix wait4() declarations"
...
* commit '2f5fa0bebdbf02e333688b2ce26dda2fe4553576':
ndk: Fix wait4() declarations
2013-12-12 18:25:03 -08:00
Andrew Hsieh
2f5fa0bebd
Merge "ndk: Fix wait4() declarations"
2013-12-13 01:51:40 +00:00
Narayan Kamath
10e8235322
am 7d3b1cc2: am 4ebf0371: am 1e18a584: Merge "Whitelist libziparchive for windows."
...
* commit '7d3b1cc2cfec31110394ef5760f39d2570f327ed':
Whitelist libziparchive for windows.
2013-12-11 21:10:02 +00:00
Narayan Kamath
7d3b1cc2cf
am 4ebf0371: am 1e18a584: Merge "Whitelist libziparchive for windows."
...
* commit '4ebf03711a8e34479f35941f2cc595e2b7283808':
Whitelist libziparchive for windows.
2013-12-11 21:06:40 +00:00
Narayan Kamath
4ebf03711a
am 1e18a584: Merge "Whitelist libziparchive for windows."
...
* commit '1e18a584efe16cd387c603738c47c0591532e8d9':
Whitelist libziparchive for windows.
2013-12-11 09:40:02 -08:00
Narayan Kamath
1e18a584ef
Merge "Whitelist libziparchive for windows."
2013-12-11 17:33:43 +00:00
David 'Digit' Turner
db275132c5
ndk: Fix wait4() declarations
...
wait4() was incorrectly declared in <sys/wait.h>, but only added to the
C library in Android 4.3 (API level 18) [1]
This patch:
- Removes the wait4() declarations for any <sys/wait.h> header before
API level 19.
- Brings the API level 19 <sys/wait.h> which correctly declares wait4().
- Update the libc.so.functions.txt for API level 19 of all platforms
to include the exported symbol.
NOTE: This does not bring the static libc.a to API level 19, which means
it is stuck at API level 9 for ARM.
See [2] for the corresponding NDK tests.
http://b.android.com/19854
[1] 17a8b0db63
[2] https://android-review.googlesource.com/#/c/72000/
Change-Id: I7735473d177c44f43b09bb6738e9914945cd4d0a
2013-12-11 17:23:46 +01:00
George Mount
3dd963e596
Merge "Add Trim Path API demo."
2013-12-11 15:09:22 +00:00
Narayan Kamath
a4ea4f1843
Whitelist libziparchive for windows.
...
Change-Id: I19d527b6b52732057b16367574edc14c7065f256
2013-12-11 14:20:33 +00:00
George Mount
fad0b21946
Add Trim Path API demo.
...
Change-Id: I1183413cf5a788950fdde52c26ddf737af921c5c
2013-12-10 07:50:42 -08:00
Qiwen Zhao
2165776685
am a924e71c: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev
...
* commit 'a924e71c93511ac0ad5456ec3a1ca7dfd35f2c79':
2013-12-10 01:58:28 +00:00
Qiwen Zhao
a924e71c93
DO NOT MERGE reset to goog/klp-volantis-dev
2013-12-09 14:10:32 -08:00
Baligh Uddin
44c0b09b7b
Remove deprecated locales
...
Bug:11340849
Change-Id: Ic82f58c40a174d05093a3b3c52833584ac7a0de3
2013-12-09 22:00:10 +00:00
Qiwen Zhao
01bd07ca25
am 5e84ff2c: (-s ours) snap to klp-dev-plus-aosp f57b1e0 with history
...
* commit '5e84ff2c5c0cd3bb25a9369553bb47eac7a8fd93':
2013-12-06 21:35:11 +00:00
Qiwen Zhao
5e84ff2c5c
snap to klp-dev-plus-aosp f57b1e0 with history
2013-12-06 12:29:04 -08:00
The Android Open Source Project
9988001a32
am f57b1e03: am e0f497fe: Merge commit \'54ec4ff7dfa9e8028f9da1986a73bddb1c00be93\' into HEAD
...
* commit 'f57b1e036df456a05d994fcebd6c3050b6157460':
2013-12-06 01:43:36 +00:00
The Android Open Source Project
f57b1e036d
am e0f497fe: Merge commit \'54ec4ff7dfa9e8028f9da1986a73bddb1c00be93\' into HEAD
...
* commit 'e0f497fe19acfafeba6d1b9977d4a775c1fe5420':
2013-12-05 17:36:01 -08:00
The Android Open Source Project
e0f497fe19
Merge commit '54ec4ff7dfa9e8028f9da1986a73bddb1c00be93' into HEAD
2013-12-05 17:25:54 -08:00
Andrew Hsieh
a1127d76f4
am 8e938888: am a77377be: Merge "Annotate JNICALL with __NDK_FPABI__"
...
* commit '8e938888b8908bd7a78fe6511665d61944a15b9d':
Annotate JNICALL with __NDK_FPABI__
2013-12-06 00:01:24 +00:00
Andrew Hsieh
8e938888b8
am a77377be: Merge "Annotate JNICALL with __NDK_FPABI__"
...
* commit 'a77377bed68bf363019d966788b06a2ca22a6683':
Annotate JNICALL with __NDK_FPABI__
2013-12-05 15:57:33 -08:00
Andrew Hsieh
a77377bed6
Merge "Annotate JNICALL with __NDK_FPABI__"
2013-12-05 23:51:36 +00:00
Andrew Hsieh
2b544b12a3
am d43cf5c8: (-s ours) am a79d5399: am fa73c847: am 54723fb6: Merge "Remove missing functions imaxabs() and imaxdiv() from inttypes.h"
...
* commit 'd43cf5c8e9456125d8cea1172467a178cc15118e':
2013-12-05 22:52:21 +00:00
Andrew Hsieh
d43cf5c8e9
am a79d5399: am fa73c847: am 54723fb6: Merge "Remove missing functions imaxabs() and imaxdiv() from inttypes.h"
...
* commit 'a79d5399f07860f713a67b1798c8cce2a4456dd3':
Remove missing functions imaxabs() and imaxdiv() from inttypes.h
2013-12-05 21:29:44 +00:00
Dianne Hackborn
49ead05468
am 1437d2c3: am 59e6f5d9: am 18159037: Add API demo for game style system UI interaction.
...
* commit '1437d2c372f4d88c4f6c5aabfa460ce8fefa3299':
Add API demo for game style system UI interaction.
2013-12-05 18:19:41 +00:00
Dianne Hackborn
1437d2c372
am 59e6f5d9: am 18159037: Add API demo for game style system UI interaction.
...
* commit '59e6f5d9c99d216db6db7e5e56648daaf909d328':
Add API demo for game style system UI interaction.
2013-12-05 10:11:49 -08:00
Dianne Hackborn
59e6f5d9c9
am 18159037: Add API demo for game style system UI interaction.
...
* commit '18159037a4f6a6b539736f6b8c0bdab4d26e3bd7':
Add API demo for game style system UI interaction.
2013-12-05 10:08:56 -08:00
Andrew Hsieh
ccf9e0c651
am 3ee7860e: am 9e09a8e8: Merge "Fix -mhard-float for calling __builtin_* math functions"
...
* commit '3ee7860eb4ed61344648bfa41d9b90b1d0883437':
Fix -mhard-float for calling __builtin_* math functions
2013-12-05 15:34:32 +00:00
Andrew Hsieh
3ee7860eb4
am 9e09a8e8: Merge "Fix -mhard-float for calling __builtin_* math functions"
...
* commit '9e09a8e81e2d9032db04a9a6edb7340ce53154d8':
Fix -mhard-float for calling __builtin_* math functions
2013-12-05 07:25:25 -08:00
Andrew Hsieh
9e09a8e81e
Merge "Fix -mhard-float for calling __builtin_* math functions"
2013-12-05 07:14:20 +00:00
Raphael Moll
cfed45de87
am 51fa6c5c: am aa198e6c: am 3519ce6e: Adjust SDK revisions for KLP MR1 for platform and samples
...
* commit '51fa6c5c5ea28658f61982cc9374d616f32ef2a2':
Adjust SDK revisions for KLP MR1 for platform and samples
2013-12-05 02:45:02 +00:00
Dianne Hackborn
18159037a4
Add API demo for game style system UI interaction.
...
Shows the ideal way for a game to interact with system UI, hiding
the status bar and nav bar while being played, making them visible
when paused or otherwise interacting with controls of the game,
and determing layout of game controls to not be covered by the
status bar or nav bar.
Change-Id: Ia192c31321113d81f96c06c7a69a06ef72c4682a
2013-12-04 16:10:30 -08:00
Raphael Moll
51fa6c5c5e
am aa198e6c: am 3519ce6e: Adjust SDK revisions for KLP MR1 for platform and samples
...
* commit 'aa198e6cd531c5c069c8f5bff94f8c889ad6c59a':
Adjust SDK revisions for KLP MR1 for platform and samples
2013-12-04 13:33:42 -08:00
Raphael Moll
aa198e6cd5
am 3519ce6e: Adjust SDK revisions for KLP MR1 for platform and samples
...
* commit '3519ce6eb348ac43536879bc94aacdea065df750':
Adjust SDK revisions for KLP MR1 for platform and samples
2013-12-04 13:30:09 -08:00
Andrew Hsieh
b05e7c1985
Annotate JNICALL with __NDK_FPABI__
...
In armeabi-v7a, VM still expects JNI functions to follow soft-abi.
Annotate it with __NDK_FPABI__ so compiler follows soft-abi in JNI
functions regardless the presence of -mhard-float in command-line.
It's up to developer to apply JNICALL consistently on JNI functions,
ie. those functions whose first arg has type "JNIEnv*" is likely to be
Change-Id: Ica7cca8ab9498ce00de6ffc7fff35f8cc13aedbf
2013-12-04 11:55:17 +08:00
Andrew Hsieh
2a571fda2b
Fix -mhard-float for calling __builtin_* math functions
...
Annotate __builtin math functions with __NDK_FPABI_MATH__ too.
1. __attribute__((pcs("aapcs"))) has no effect on codegen when __buitlin
function is emitted inlined.
2. When __builtin call into regular function in Android's libm, it has
proper attribute which observes soft float-abi
Change-Id: I11e8b74fc22f3072b9ce849193e4a56e98c92d64
2013-12-04 11:45:04 +08:00
Andrew Hsieh
7582b31a67
am eb9388bc: am d9c17aa7: Merge "Enhance hello-jni to report APP_ABI at compilation"
...
* commit 'eb9388bcee5372b3c935f92d59bc396500a5e6a7':
Enhance hello-jni to report APP_ABI at compilation
2013-12-02 23:31:27 +00:00
Raphael Moll
65bde24ccf
am 90157f82: am f7624c5a: am c04b7aad: SDK Repository: switch to sdk addon revision 6.
...
* commit '90157f82c5c078551bed927c3c3dc10a85f4f90c':
SDK Repository: switch to sdk addon revision 6.
2013-12-02 23:31:27 +00:00
Andrew Hsieh
eb9388bcee
am d9c17aa7: Merge "Enhance hello-jni to report APP_ABI at compilation"
...
* commit 'd9c17aa7d791d1428ab19127e39892f6b8480efd':
Enhance hello-jni to report APP_ABI at compilation
2013-12-02 01:02:52 -08:00
Andrew Hsieh
d9c17aa7d7
Merge "Enhance hello-jni to report APP_ABI at compilation"
2013-12-02 08:56:51 +00:00
Andrew Hsieh
833979268e
Enhance hello-jni to report APP_ABI at compilation
...
Change-Id: I24989212cfb729705cc4177a7112804fa68144c4
2013-12-02 10:22:47 +08:00
Raphael Moll
3519ce6eb3
Adjust SDK revisions for KLP MR1 for platform and samples
...
Platform changes from 19 r1 to 19 r2.
Samples changes from 19 r1 to 19 r2.
Change-Id: Ia391fef04468211f460f3e8d6ab83e0a4dc12a70
2013-11-27 13:11:16 -08:00