Robert Greenwalt
ab7c289d25
am 410bcade: Merge "Use the updated RouteInfo API." into lmp-preview-dev
...
* commit '410bcade765d12d822b54dee4bd74840d396d581':
Use the updated RouteInfo API.
2014-06-12 19:56:46 +00:00
Alan Viverette
6fcf326d1a
Add list navigation to API Demos
...
BUG: 15566102
Change-Id: I4c1dd13d5ac5502d6d3f879ce916b09d81338940
2014-06-12 12:56:36 -07:00
smain@google.com
2b6347e144
am 2274fcaa: am f60cdb2e: add redirects for new sdk workflow organization as per: If8a8855bdb8e8ec9b0eefedd35ae24ea60497741
...
* commit '2274fcaa0824a521d6d14dc2f2669b48a0c16332':
add redirects for new sdk workflow organization as per: If8a8855bdb8e8ec9b0eefedd35ae24ea60497741
2014-06-12 19:23:51 +00:00
Robert Greenwalt
410bcade76
Merge "Use the updated RouteInfo API." into lmp-preview-dev
2014-06-11 23:10:23 +00:00
Glenn Kasten
f59aa1d223
Merge "Update OpenSLES_Android.h for API 20"
2014-06-11 21:23:31 +00:00
Yigit Boyar
6f28e3a933
Merge "DO NOT MERGE Disable predictive animations in RecyclerView demo" into lmp-preview-dev
2014-06-11 21:23:31 +00:00
Yigit Boyar
365d701866
DO NOT MERGE Disable predictive animations in RecyclerView demo
...
Change-Id: I3b8ea3896866e389ccae2db32b1828194b8acf25
2014-06-11 23:41:50 +00:00
Raphael Moll
b4654552c5
am bbd9b96c: am 8235126e: am 9649c415: Merge "Change api-versions.xml generator source order."
...
* commit 'bbd9b96cd10864554c5f3f9ab5e0e1bbf43442b6':
Change api-versions.xml generator source order.
2014-06-11 20:24:31 +00:00
Ying Wang
3016ff6d0a
am c8ed8c25: am bcfa67e5: am 1e1b10ac: Merge "Switch to SDK_HOST_ARCH"
...
* commit 'c8ed8c25bc796cd82fb1df0ea100e320a542eeb3':
Switch to SDK_HOST_ARCH
2014-06-11 19:26:28 +00:00
Andrew Hsieh
95a6cb0724
am e233c416: am 86509e1d: am 0e85aa03: Merge "Add missing mips64 lib-bootstrap"
...
* commit 'e233c416944455f9ecf00900fb5f5e1075d407f5':
Add missing mips64 lib-bootstrap
2014-06-11 18:37:19 +00:00
Raphael Moll
b6fbb4d0c9
am 9cec99d9: am ea21b816: am 28748be7: Merge "Generate api-versions.xml for lint."
...
* commit '9cec99d9540822e68559e25b471bbe788352839d':
Generate api-versions.xml for lint.
2014-06-11 18:18:59 +00:00
Elliott Hughes
fe134ceca3
am fc800c1d: am 877b9486: am 815d7a7d: Merge "Fix build by removing libportable from the default build."
...
* commit 'fc800c1dba34a8da105e18242257af56fa2ac754':
Fix build by removing libportable from the default build.
2014-06-11 17:44:57 +00:00
Chris Banes
e6174a6e97
Merge "DO NOT MERGE Add android-support-v7-palette to build" into lmp-preview-dev
2014-06-11 15:57:38 +00:00
Chet Haase
5dc15512b8
am 2d719d6c: AnimatedRecyclerActivity demo supports simpler RV item animations
...
* commit '2d719d6c716e4b800c9b9bcd31fe36fdddb8adfd':
AnimatedRecyclerActivity demo supports simpler RV item animations
2014-06-11 12:41:38 +00:00
Xavier Ducrohet
e2172b71fc
Remove non-ready support libs. DO NOT MERGE.
...
Change-Id: I319e9cb26e5ebfaafb3aa209732914f90ddf1446
2014-06-10 17:27:26 -07:00
Sreeram Ramachandran
ef57b53c63
Use the updated RouteInfo API.
...
Bug: 15142362
Bug: 13885501
Change-Id: I97f1625e037c889b0cddd3db418c42c1d48b26b9
(cherry picked from commit 732d646f51 )
2014-06-10 22:28:51 +00:00
Deepanshu Gupta
f7449cdb18
Merge "Package renamed fonts again." into lmp-preview-dev
2014-06-10 22:12:51 +00:00
Deepanshu Gupta
4100ca144d
Package renamed fonts again.
...
PS names of fonts are renamed to include the version number. This change
packages the fonts from the output directory of the script that modifies
the fonts.
Change-Id: I023fb0dfcf50698f80e26b7d476969c453fc4cc7
2014-06-10 18:42:40 -07:00
Sreeram Ramachandran
6618e52d97
Merge "Use the updated RouteInfo API."
2014-06-10 21:59:55 +00:00
Andrew Hsieh
e577c6b4e3
Merge "Fix ssize_t, WCHAR_MIN and WCHAR_MAX"
2014-06-10 21:55:12 +00:00
Raphael Moll
fe00e3932d
Merge "SDK samples package 20 revision 1" into lmp-preview-dev
2014-06-10 21:32:31 +00:00
Raphael Moll
ae066e333a
SDK samples package 20 revision 1
...
Change-Id: I11f1bdeb7c1f5755962fd923556d778b8c3fa3cd
2014-06-15 01:50:47 +00:00
Raphael Moll
bbd9b96cd1
am 8235126e: am 9649c415: Merge "Change api-versions.xml generator source order."
...
* commit '8235126ebf42ddd9dd1e9d8191be67ae46cb54ae':
Change api-versions.xml generator source order.
2014-06-10 21:12:13 +00:00
Raphael Moll
8235126ebf
am 9649c415: Merge "Change api-versions.xml generator source order."
...
* commit '9649c415e7e959b67a8810cd17ab65b7994c0f71':
Change api-versions.xml generator source order.
2014-06-10 21:08:36 +00:00
Raphael Moll
9649c415e7
Merge "Change api-versions.xml generator source order."
2014-06-10 21:00:58 +00:00
Chet Haase
2d719d6c71
AnimatedRecyclerActivity demo supports simpler RV item animations
...
Add logic to AnimatedRecyclerActivity to allow it to opt into, or out of,
predictive item animations in RecyclerView.
Issue #15542012 Simplify RecyclerView animations
Change-Id: Ibb089a98c4d465730cfbff2a9dec369e28feff82
2014-06-10 12:35:41 -07:00
Jesse Hall
94bb931884
resolved conflicts for merge of 3e06bd39 to master
...
I'm not sure why git thought there was a conflict; it thought these
files had been deleted in master and renamed in lmp-preview-dev. In
reality, they've never existed anywhere, and were created in
lmp-preview-dev by the change being merged. Weird.
Conflicts:
ndk/platforms/android-21/arch-arm/symbols/libGLESv3.so.functions.txt
ndk/platforms/android-21/arch-arm/symbols/libGLESv3.so.variables.txt
ndk/platforms/android-21/arch-arm64/symbols/libGLESv3.so.functions.txt
ndk/platforms/android-21/arch-arm64/symbols/libGLESv3.so.variables.txt
ndk/platforms/android-21/arch-mips/symbols/libGLESv3.so.functions.txt
ndk/platforms/android-21/arch-mips/symbols/libGLESv3.so.variables.txt
ndk/platforms/android-21/arch-mips64/symbols/libGLESv3.so.variables.txt
ndk/platforms/android-21/arch-x86/symbols/libGLESv3.so.variables.txt
ndk/platforms/android-21/arch-x86_64/symbols/libGLESv3.so.variables.txt
Change-Id: Ic7cc66f1fa053ff05d55911caad92dfd6669138d
2014-06-10 12:17:15 -07:00
Raphael Moll
7d86138caa
Change api-versions.xml generator source order.
...
The generator now takes files first from prebuilts/tools
and then if not found takes them from prebuilds/sdk.
Change-Id: Ia099c26202292537e92eaaaa5c26ad2916114f1e
2014-06-10 11:10:57 -07:00
Jesse Hall
3e06bd393d
Merge changes Iecdc1d2c,Id675df1a into lmp-preview-dev
...
* changes:
ndk: Add GLES 3.1 and AEP extensions to NDK libGLESv3.so
ndk: Remove extra GLES symbols on 64-bit platforms
2014-06-10 16:34:28 +00:00
Ying Wang
c8ed8c25bc
am bcfa67e5: am 1e1b10ac: Merge "Switch to SDK_HOST_ARCH"
...
* commit 'bcfa67e56dd7862d085954d2c4b349f8199c3d28':
Switch to SDK_HOST_ARCH
2014-06-10 16:30:41 +00:00
Ying Wang
bcfa67e56d
am 1e1b10ac: Merge "Switch to SDK_HOST_ARCH"
...
* commit '1e1b10acd152ae67670587ef1682ba6a3ed8a66c':
Switch to SDK_HOST_ARCH
2014-06-10 16:28:00 +00:00
Ying Wang
1e1b10acd1
Merge "Switch to SDK_HOST_ARCH"
2014-06-10 16:26:22 +00:00
Jeff Sharkey
49e67f2a61
am 893d702d: Follow directory API changes.
...
* commit '893d702d1207dcaa3bbcac45597fc3cc04b420ff':
Follow directory API changes.
2014-06-10 14:55:36 +00:00
Chris Banes
34d8ff4c6a
DO NOT MERGE Add android-support-v7-palette to build
...
Change-Id: I22cec92b976645d766441b140a5d5754c4ebbe46
(cherry picked from commit 8028b39252 )
2014-06-10 14:00:04 +00:00
Andrew Hsieh
a5c12d1936
Update libm_hard.a
...
1) Add ldexp. ldexp used to co-exist in both libc.so and libm.so until
the removal from libm.so in ICS. Unfortunately the sole copy of libm_hard.a
in NDK was compiled from JB source and miss ldexp. Code compiled with
hard-float using ldexp may use libc.so which follows soft-float and misbehave
2) Turns out the following (all in fpclassify.o) also exists in recent libc.so
too. Add them in libm_hard.a as well:
__fpclassifyd
__fpclassifyf
__fpclassifyl
__isfinitef
__isfinite
__isfinitel
__isinff
__isinf
__isinfl
__isnanl
__isnormalf
__isnormal
__isnormall
isinf
isnan
isnanf
Change-Id: Ia157fb2911341988de102e55d0c6f6141a9c3dda
2014-06-10 10:58:37 +08:00
Andrew Hsieh
9983b467e5
Fix ssize_t, WCHAR_MIN and WCHAR_MAX
...
1) ssize_t is int, instead of long int
2) WCHAR_MIN and WCHAR_MAX be consistent with bionic's:
respond to __WCHAR_UNSIGNED__, work for both signed (X86/MIPS)
and unsigned (ARM) wchar_t, and work for -fshort-wchar too
Change-Id: Ief1be007571b50c5d63a819df489f9d3f9b47bc8
2014-06-10 10:51:46 +08:00
Andrew Hsieh
e233c41694
am 86509e1d: am 0e85aa03: Merge "Add missing mips64 lib-bootstrap"
...
* commit '86509e1de09f05c3f03073c6f3b399a73158cbe9':
Add missing mips64 lib-bootstrap
2014-06-10 01:14:55 +00:00
Andrew Hsieh
86509e1de0
am 0e85aa03: Merge "Add missing mips64 lib-bootstrap"
...
* commit '0e85aa033e1d97ecd3578cf30f7c90028e1dcb91':
Add missing mips64 lib-bootstrap
2014-06-10 01:12:31 +00:00
Andrew Hsieh
0e85aa033e
Merge "Add missing mips64 lib-bootstrap"
2014-06-10 01:08:44 +00:00
Raphael Moll
9cec99d954
am ea21b816: am 28748be7: Merge "Generate api-versions.xml for lint."
...
* commit 'ea21b8169062fecf0bf32abafc5892ad3beb8238':
Generate api-versions.xml for lint.
2014-06-09 23:52:02 +00:00
Raphael Moll
ea21b81690
am 28748be7: Merge "Generate api-versions.xml for lint."
...
* commit '28748be7e5a95ca32fd4b930be05ad4bdd365a43':
Generate api-versions.xml for lint.
2014-06-09 23:49:42 +00:00
Jeff Sharkey
893d702d12
Follow directory API changes.
...
Bug: 15429194
Change-Id: Ib30c8c3697dbf883cdbaef5a839ddd9bc0a900d0
2014-06-09 16:48:32 -07:00
Raphael Moll
28748be7e5
Merge "Generate api-versions.xml for lint."
2014-06-09 23:47:28 +00:00
Raphael Moll
4f8a38ed7a
Generate api-versions.xml for lint.
...
Depends on:
- tools/base I747d27e998c6dbd61dd17c44bfc747c9542e33d1
- tools/buildSrc I400f4b6c146836ba30e6e7985ca6c9894985a8cb
- prebuilts/tools Ia4b0c477cf6f4788de610be017a9f5b43d73486c
Change-Id: I3f791d5e1d0ea893cdb5969854d9ae99d5fbb5b7
2014-06-09 15:59:58 -07:00
Ying Wang
e7db94431e
Switch to SDK_HOST_ARCH
...
SDK_HOST_ARCH will be x86 if we are doing 32-bit host multilib build,
in which HOST_ARCH is actually x86_64.
Bug: 13751317
Change-Id: I8b7893b10cc4d0e71076b3b3625ec2f352aa8602
2014-06-09 15:03:04 -07:00
Elliott Hughes
fc800c1dba
am 877b9486: am 815d7a7d: Merge "Fix build by removing libportable from the default build."
...
* commit '877b94867c7f420ab0d2f4e0ba7a3f6cc7c1f6e1':
Fix build by removing libportable from the default build.
2014-06-09 22:00:01 +00:00
Elliott Hughes
877b94867c
am 815d7a7d: Merge "Fix build by removing libportable from the default build."
...
* commit '815d7a7d05cc95f828f463afc4ac7d52bb0f1b53':
Fix build by removing libportable from the default build.
2014-06-09 21:55:58 +00:00
Elliott Hughes
815d7a7d05
Merge "Fix build by removing libportable from the default build."
2014-06-09 21:52:26 +00:00
Elliott Hughes
cbe970b82a
Fix build by removing libportable from the default build.
...
Easier than working out how to fix the fenv stuf...
Change-Id: Id457d4fcd790b1fc13047cba29c7d47118196a87
2014-06-09 14:51:24 -07:00
Erik Pasternak
a4a83ccba1
am 0b7a8dbd: Merge "Revert "Package renamed fonts."" into lmp-preview-dev
...
* commit '0b7a8dbde8b006aef349f75f4837b7f1c9e498fd':
Revert "Package renamed fonts."
2014-06-09 15:55:46 +00:00