Andrew Hsieh
8eff33c2c3
am 0862223e: am 412eed7a: am 13f2b7e1: Merge "Fix rendering issue in Tegra2/3."
...
* commit '0862223e51f5727f7cf1d50f43310c555282ad49':
Fix rendering issue in Tegra2/3.
2013-12-30 18:09:08 +00:00
Andrew Hsieh
0862223e51
am 412eed7a: am 13f2b7e1: Merge "Fix rendering issue in Tegra2/3."
...
* commit '412eed7a9414317bc3f591fb9cb1c5a28a2f5974':
Fix rendering issue in Tegra2/3.
2013-12-30 06:10:20 +00:00
Andrew Hsieh
412eed7a94
am 13f2b7e1: Merge "Fix rendering issue in Tegra2/3."
...
* commit '13f2b7e16913512d4042a35dec05d71bba2983b0':
Fix rendering issue in Tegra2/3.
2013-12-29 22:05:57 -08:00
Andrew Hsieh
13f2b7e169
Merge "Fix rendering issue in Tegra2/3."
2013-12-30 06:01:25 +00:00
Hak Matsuda
2a0781b43d
Fix rendering issue in Tegra2/3.
...
Now having medium precision for specular variable, so that specular power can be <1.0
Change-Id: I15459d34e269ba7d31bc899460540fe390e5e294
2013-12-30 13:49:23 +08:00
Andrew Hsieh
5ed6ffdc63
am 4ecd37d0: am 57ebb3aa: am 7c35de7f: Merge "Add support for building the NDK\'s native_app_glue."
...
* commit '4ecd37d09127e1faa55608248f1f1705170ee3dd':
Add support for building the NDK's native_app_glue.
2013-12-27 00:12:39 +00:00
Andrew Hsieh
4ecd37d091
am 57ebb3aa: am 7c35de7f: Merge "Add support for building the NDK\'s native_app_glue."
...
* commit '57ebb3aaa50b1f6aa032f882c6baaa69aa2da762':
Add support for building the NDK's native_app_glue.
2013-12-27 00:09:19 +00:00
Andrew Hsieh
57ebb3aaa5
am 7c35de7f: Merge "Add support for building the NDK\'s native_app_glue."
...
* commit '7c35de7f0a1747b868304daff1c75907cba215b3':
Add support for building the NDK's native_app_glue.
2013-12-26 16:06:10 -08:00
Andrew Hsieh
7c35de7f0a
Merge "Add support for building the NDK's native_app_glue."
2013-12-27 00:00:01 +00:00
Todd Fiala
cfa0f35d00
Add support for building the NDK's native_app_glue.
...
Required for upcoming CTS tests that utilize the native_app_glue
framework to simplify native test apps.
In support of this feature:
https://code.google.com/p/android/issues/detail?id=63920
Change-Id: I3fe5dab26c147636538a4b519683493d8e78d26f
2013-12-26 15:39:36 +00:00
Andrew Hsieh
575bd01253
am d9abded2: am 7a432f8c: am 11728ce9: Merge "Workaround the __builtin_isnan() type error for clang 3.4."
...
* commit 'd9abded2b2ecdd6bd2f41ebd11fdf5ed1b1303d1':
Workaround the __builtin_isnan() type error for clang 3.4.
2013-12-25 02:19:14 +00:00
Andrew Hsieh
d9abded2b2
am 7a432f8c: am 11728ce9: Merge "Workaround the __builtin_isnan() type error for clang 3.4."
...
* commit '7a432f8cf2f16611a2964c1208d363ffc0e0be9f':
Workaround the __builtin_isnan() type error for clang 3.4.
2013-12-25 02:16:49 +00:00
Andrew Hsieh
7a432f8cf2
am 11728ce9: Merge "Workaround the __builtin_isnan() type error for clang 3.4."
...
* commit '11728ce9bbfaaf3599566b94d6a4207fde749beb':
Workaround the __builtin_isnan() type error for clang 3.4.
2013-12-24 18:12:16 -08:00
Andrew Hsieh
11728ce9bb
Merge "Workaround the __builtin_isnan() type error for clang 3.4."
2013-12-25 02:09:13 +00:00
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
ad9fef85c1
am a8a66a4e: am 3356457a: am 9092f8fb: Merge "Use uapi kernel headers."
...
* commit 'a8a66a4e1972f2abf315ea3e3abe6a9413cf703b':
Use uapi kernel headers.
2013-12-20 19:18:24 +00:00
Christopher Ferris
a8a66a4e19
am 3356457a: am 9092f8fb: Merge "Use uapi kernel headers."
...
* commit '3356457a94d3e0754479832ac18cdf202c36cdaf':
Use uapi kernel headers.
2013-12-20 19:15:36 +00:00
Christopher Ferris
3356457a94
am 9092f8fb: Merge "Use uapi kernel headers."
...
* commit '9092f8fb0a86501fe0781f138e96e1dd2638c778':
Use uapi kernel headers.
2013-12-20 11:10:36 -08:00
Christopher Ferris
9092f8fb0a
Merge "Use uapi kernel headers."
2013-12-20 19:06:05 +00:00
Adam Powell
d6ffb0ae6d
am 544a42f0: Example activity for RecyclerView
...
* commit '544a42f00f501ff8570f0c60094ccf5152e928f8':
Example activity for RecyclerView
2013-12-19 22:22:10 +00:00
Adam Powell
544a42f00f
Example activity for RecyclerView
...
Also includes a very basic custom RecyclerView LayoutManager.
Change-Id: Ic6dca39a4e71dbe8b3b82965299bc554fad18a43
2013-12-19 22:17:33 +00:00
Christopher Ferris
7bc2433721
Use uapi kernel headers.
...
Bug: 11559337
Change-Id: I9060b95f9e5d0b7d2173695d6a27df7b4d5d0758
2013-12-18 14:59:59 -08:00
Tor Norbye
09ace69a89
Remove Nullable annotation
...
The one in the framework is being hidden; for app usage we're
adding one in the support library.
Change-Id: I5612579b4d282e78d592d36bd35d51d28cf82b37
2013-12-17 19:43:59 -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