Logan Chien
ad40d952a1
Workaround the __builtin_isnan() type error for clang 3.4.
...
Similar to clang 3.3, it seems that clang 3.4 declares an incompatible
function prototypes for __builtin_isnan(). To workaround this issue,
we should not declare the function prototype for __builtin_isnan().
Note: Though it may be good to fix this in clang type checker, like
__builtin_nexttoward(), however it seems non-trivial since __builtin_isnsn()
might be overloaded. We can revert this after we have fixed the
clang builtin definition.
Change-Id: I329b56225f3d229b0c141bb8414c4369f154efda
2013-12-25 01:59:29 +00:00
Christopher Ferris
9092f8fb0a
Merge "Use uapi kernel headers."
2013-12-20 19:06:05 +00:00
Christopher Ferris
7bc2433721
Use uapi kernel headers.
...
Bug: 11559337
Change-Id: I9060b95f9e5d0b7d2173695d6a27df7b4d5d0758
2013-12-18 14:59:59 -08:00
Andrew Hsieh
2f5fa0bebd
Merge "ndk: Fix wait4() declarations"
2013-12-13 01:51:40 +00: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
Narayan Kamath
a4ea4f1843
Whitelist libziparchive for windows.
...
Change-Id: I19d527b6b52732057b16367574edc14c7065f256
2013-12-11 14:20:33 +00:00
The Android Open Source Project
e0f497fe19
Merge commit '54ec4ff7dfa9e8028f9da1986a73bddb1c00be93' into HEAD
2013-12-05 17:25:54 -08:00
Andrew Hsieh
a77377bed6
Merge "Annotate JNICALL with __NDK_FPABI__"
2013-12-05 23:51:36 +00:00
Andrew Hsieh
9e09a8e81e
Merge "Fix -mhard-float for calling __builtin_* math functions"
2013-12-05 07:14:20 +00: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
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
Ben Cheng
18e10d81e3
am 4a09318c: Merge "Temporarily disable elftree on darwin-x86"
...
* commit '4a09318c1e6f2ffde53ac9219bb0e392228ef925':
Temporarily disable elftree on darwin-x86
2013-11-22 17:22:11 -08:00
Ben Cheng
4a09318c1e
Merge "Temporarily disable elftree on darwin-x86"
2013-11-23 01:15:49 +00:00
Ben Cheng
4a7c39c97b
Temporarily disable elftree on darwin-x86
...
Change-Id: Ib4a73283ad18088de33da3c00278aae67c485fac
2013-11-22 17:02:53 -08:00
The Android Open Source Project
c61dbe23a4
Merge commit '8eccbd3b5d90b9f0557c9a01f49d45e98ac85a46' into HEAD
2013-11-22 16:46:47 -08:00
Kenny Root
7e0d5c29b3
am c9421a7a: Merge "make_key: add EC key generation support"
...
* commit 'c9421a7ac67b6613acfb1415964947afb4c0fa30':
make_key: add EC key generation support
2013-11-22 10:40:39 -08:00
Kenny Root
c9421a7ac6
Merge "make_key: add EC key generation support"
2013-11-22 18:37:38 +00:00
Ben Cheng
45d1998989
am 4b60b014: Merge "Switch to use elfutils 0.153"
...
* commit '4b60b0143dd26498a13efa4e8b1851b71e8581e0':
Switch to use elfutils 0.153
2013-11-21 16:48:11 -08:00
Ben Cheng
4b60b0143d
Merge "Switch to use elfutils 0.153"
2013-11-22 00:45:17 +00:00
Ben Cheng
75c68c9c53
Switch to use elfutils 0.153
...
Change-Id: Ie6ee5911949f6d32f39f1f8800ddf41550dedd95
2013-11-21 16:36:27 -08:00
Andrew Hsieh
3053834fdc
am c044b5e3: Merge "- Using hard-fp - Immersive mode in android-19 - Fixed local reference release in JNI helper - Misc fixes Change-Id: I3ab19c2b66648bb7a011c462d9d98e75bc136ce6"
...
* commit 'c044b5e3673ed685693b3b381cebc4688e219334':
- Using hard-fp - Immersive mode in android-19 - Fixed local reference release in JNI helper - Misc fixes Change-Id: I3ab19c2b66648bb7a011c462d9d98e75bc136ce6
2013-11-21 00:11:20 -08:00
Andrew Hsieh
c044b5e367
Merge "- Using hard-fp - Immersive mode in android-19 - Fixed local reference release in JNI helper - Misc fixes Change-Id: I3ab19c2b66648bb7a011c462d9d98e75bc136ce6"
2013-11-21 08:08:22 +00:00
Hak Matsuda
cc69f210a7
- Using hard-fp
...
- Immersive mode in android-19
- Fixed local reference release in JNI helper
- Misc fixes
Change-Id: I3ab19c2b66648bb7a011c462d9d98e75bc136ce6
2013-11-21 16:06:02 +08:00
Elliott Hughes
f067a933f5
am 1f1e7379: Merge "MIPS hasn\'t supported SA_RESTORER since 2.5 kernels."
...
* commit '1f1e7379078e898dc21f4f52dc5bb46e19e03ce5':
MIPS hasn't supported SA_RESTORER since 2.5 kernels.
2013-11-20 16:09:39 -08:00
Elliott Hughes
1f1e737907
Merge "MIPS hasn't supported SA_RESTORER since 2.5 kernels."
2013-11-21 00:07:49 +00:00
Elliott Hughes
dfb6545c6b
MIPS hasn't supported SA_RESTORER since 2.5 kernels.
...
Change-Id: Ia3500168ab5ba5ba381d0195e9ecc26a618bf505
2013-11-20 11:34:53 -08:00
Joe Fernandez
54ec4ff7df
am becd685b: am 4233252a: Sample code for OpenGL Android training class
...
* commit 'becd685b66f349063f642e2292d21d22d0964ba1':
Sample code for OpenGL Android training class
2013-11-15 11:59:36 -08:00
Joe Fernandez
becd685b66
am 4233252a: Sample code for OpenGL Android training class
...
* commit '4233252af95fe9f12c47fdde92ea4718b3334108':
Sample code for OpenGL Android training class
2013-11-15 19:56:27 +00:00
Joe Fernandez
4233252af9
Sample code for OpenGL Android training class
...
( Original Id: Ib1650025a3c4b018c60d70ede3f25113660f68d8 )
Change-Id: I1d760b75d1f2bfe1ec90c71471867577bd146241
(cherry picked from commit 66f6fe6633 )
2013-11-15 19:15:57 +00:00
Andrew Hsieh
1785c98962
am 7956dc3c: am faab12a0: Merge "Update time.h for CLOCK_BOOTTIME, etc"
...
* commit '7956dc3c87503530696ddd42d3a0f71decb0bcf6':
Update time.h for CLOCK_BOOTTIME, etc
2013-11-14 18:38:06 -08:00
Andrew Hsieh
1badc519ef
am a60db2e7: am 69139a5a: Merge "Added missing clock_settime()/clock_nanosleep() in time.h API>=8"
...
* commit 'a60db2e71416714964613c53e0b093bc77aa4442':
Added missing clock_settime()/clock_nanosleep() in time.h API>=8
2013-11-14 18:38:04 -08:00
Andrew Hsieh
7956dc3c87
am faab12a0: Merge "Update time.h for CLOCK_BOOTTIME, etc"
...
* commit 'faab12a0586cf4afef6fe2607bcba394c53b1d1d':
Update time.h for CLOCK_BOOTTIME, etc
2013-11-14 18:33:59 -08:00
Andrew Hsieh
a60db2e714
am 69139a5a: Merge "Added missing clock_settime()/clock_nanosleep() in time.h API>=8"
...
* commit '69139a5aa58c0b85fc0d0e9763baa3b52a327e29':
Added missing clock_settime()/clock_nanosleep() in time.h API>=8
2013-11-14 18:33:58 -08:00
Andrew Hsieh
faab12a058
Merge "Update time.h for CLOCK_BOOTTIME, etc"
2013-11-15 02:29:28 +00:00
Andrew Hsieh
69139a5aa5
Merge "Added missing clock_settime()/clock_nanosleep() in time.h API>=8"
2013-11-15 02:29:14 +00:00
Andrew Hsieh
a2e8997b9f
Update time.h for CLOCK_BOOTTIME, etc
...
Add CLOCK_MONOTONIC_RAW, CLOCK_REALTIME_COARSE, CLOCK_MONOTONIC_COARSE,
CLOCK_BOOTTIME, CLOCK_REALTIME_ALARM, and CLOCK_BOOTTIME_ALARM
Remove obsolete CLOCK_REALTIME_HR and CLOCK_MONOTONIC_HR
See:
0351955a686fe4e0bf9f30780f78ff0e2402a6b0
b928bda83d4413b703329f607e2706602f15293f
60e5144ca312b210b54ac8e6966108da0c97ff80
Change-Id: Ibc9e297ab71f3dc16eec0746f835f89e554fd68b
2013-11-14 12:14:12 +08:00
Andrew Hsieh
cd3fe9b4b2
Added missing clock_settime()/clock_nanosleep() in time.h API>=8
...
See patch for API < 8 at 7761beeb56 .
Change-Id: I906172a34645e2659a5b9f8acb2652a4b4eb857d
2013-11-14 11:57:04 +08:00
Jeff Sharkey
f652b21784
am f7ca56e8: am b4b28f87: Only enable VaultProvider on KitKat devices.
...
* commit 'f7ca56e83df39502b603ecdaa4ca12fd0afef733':
Only enable VaultProvider on KitKat devices.
2013-11-13 14:51:57 -08:00
Jeff Sharkey
f7ca56e83d
am b4b28f87: Only enable VaultProvider on KitKat devices.
...
* commit 'b4b28f87362f2f910042fceb0ea274d4d98028b7':
Only enable VaultProvider on KitKat devices.
2013-11-13 14:48:21 -08:00
Jeff Sharkey
b4b28f8736
Only enable VaultProvider on KitKat devices.
...
Otherwise the app would crash when starting on pre-KK devices missing
the parent class.
Bug: 11670294
Change-Id: I6fc843ba9d525265a4aaad6e8896a3e66d577d1f
2013-11-13 14:33:04 -08:00
Jeff Sharkey
f191627b9f
am 39b80a76: am c21b79e2: Fix build breakage.
...
* commit '39b80a765cda05173bc04af8f3d9ebda6e8b98a0':
Fix build breakage.
2013-11-13 00:32:55 -08:00
Jeff Sharkey
39b80a765c
am c21b79e2: Fix build breakage.
...
* commit 'c21b79e22d1e9ad2384844fdaa4b0c2b5945e914':
Fix build breakage.
2013-11-13 00:29:39 -08:00
Jeff Sharkey
c21b79e22d
Fix build breakage.
...
Change-Id: I82216379660604eedcd22b22536b385b8aa18c48
2013-11-13 00:24:12 -08:00
Jeff Sharkey
fe06414ae7
am b09a66d2: am 93de4115: Vault example documents provider.
...
* commit 'b09a66d28e21fc019ea0a88fa57ce5f3c54e710a':
Vault example documents provider.
2013-11-12 23:45:33 -08:00
Jeff Sharkey
b09a66d28e
am 93de4115: Vault example documents provider.
...
* commit '93de41153819ff3e64f5e6cc8ec0fabd529503eb':
Vault example documents provider.
2013-11-12 23:41:38 -08:00
Andrew Hsieh
2e5441016a
am 41ae572f: am aaebba0e: Merge "Add utimensat and futimens to libc.so at API level 12 and 19, respectively"
...
* commit '41ae572f9d9e40aea58f90205e8d29894b3f0a97':
Add utimensat and futimens to libc.so at API level 12 and 19, respectively
2013-11-12 16:52:53 -08:00
Andrew Hsieh
41ae572f9d
am aaebba0e: Merge "Add utimensat and futimens to libc.so at API level 12 and 19, respectively"
...
* commit 'aaebba0e9e564c8b50286bfef6e2ee3e8f2535be':
Add utimensat and futimens to libc.so at API level 12 and 19, respectively
2013-11-12 16:50:38 -08:00