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
Deepanshu Gupta
177e561e40
am cde7418e: Merge "Package renamed fonts." into lmp-preview-dev
...
* commit 'cde7418ead103db609dbee8e43b2b91992f3a74a':
Package renamed fonts.
2014-06-09 15:55:27 +00:00
Andrew Hsieh
2ae52388f3
Add missing mips64 lib-bootstrap
...
Such that the following can correctly populate sysroot just enough to rebuild
mips64el toolchain
./build/tools/gen-platforms.sh --minimal --dst-dir=$NDK --ndk-dir=$NDK --arch=mips64
Change-Id: Ib37516bfe4c4b6a0c5b479d7cec8764c161f02c8
2014-06-09 17:37:46 +08:00
Andrew Hsieh
f6ca3b75de
am 397301be: am b71ef233: am ecfe9d09: Merge "64-bit mips64el-* multilib sysroot"
...
* commit '397301be5ea7f7cb7cf43bb10163a31618aa1829':
64-bit mips64el-* multilib sysroot
2014-06-09 01:15:14 +00:00
Andrew Hsieh
397301be5e
am b71ef233: am ecfe9d09: Merge "64-bit mips64el-* multilib sysroot"
...
* commit 'b71ef23353f15a670637e337891c75c2ea806aea':
64-bit mips64el-* multilib sysroot
2014-06-09 01:11:44 +00:00
Andrew Hsieh
b71ef23353
am ecfe9d09: Merge "64-bit mips64el-* multilib sysroot"
...
* commit 'ecfe9d094677cc5fc9e04b8681893f78a87926f1':
64-bit mips64el-* multilib sysroot
2014-06-09 01:09:24 +00:00
Andrew Hsieh
ecfe9d0946
Merge "64-bit mips64el-* multilib sysroot"
2014-06-09 01:06:34 +00:00
Erik Pasternak
0b7a8dbde8
Merge "Revert "Package renamed fonts."" into lmp-preview-dev
2014-06-08 20:12:43 +00:00
Erik Pasternak
cdee35f788
Revert "Package renamed fonts."
...
This change broke the SDK builds.
This reverts commit ef43acc413 .
Change-Id: I84af70750f72792cd2e509677c398faefa6e8d91
2014-06-08 19:30:44 +00:00
Elliott Hughes
fbc8ae15b2
am 7d1aa271: am 55dc8e65: am 91e2c5dc: Merge "Fix libportable build breakage."
...
* commit '7d1aa27155b6b6dbac9290d2c073b20be96f3fb4':
Fix libportable build breakage.
2014-06-08 09:03:18 +00:00
Elliott Hughes
7d1aa27155
am 55dc8e65: am 91e2c5dc: Merge "Fix libportable build breakage."
...
* commit '55dc8e65c24e3b0dd99049d9552b6f5c96ba5eea':
Fix libportable build breakage.
2014-06-08 08:29:35 +00:00
Elliott Hughes
55dc8e65c2
am 91e2c5dc: Merge "Fix libportable build breakage."
...
* commit '91e2c5dcde466a1f147220b3c753862b77a5da9e':
Fix libportable build breakage.
2014-06-08 05:33:30 +00:00
Elliott Hughes
91e2c5dcde
Merge "Fix libportable build breakage."
2014-06-08 05:30:16 +00:00
Elliott Hughes
fc9ac9f173
Fix libportable build breakage.
...
Change-Id: Ic85e36cf55b7486b50fc9f1513f10a8ade5e86e9
2014-06-07 22:24:44 -07:00
Deepanshu Gupta
cde7418ead
Merge "Package renamed fonts." into lmp-preview-dev
2014-06-07 23:33:25 +00:00
Alan Viverette
9a6e791e6c
Merge "Material theme"
2014-06-06 22:49:45 +00:00
Raphael Moll
1113cea984
am fcabb6e7: am 95671f78: am 03afa4d6: Merge "Android USB driver: support 4EE7 (Nexus adb only)."
...
* commit 'fcabb6e7aa382edb1e009d1cd92162c21bca2cee':
Android USB driver: support 4EE7 (Nexus adb only).
2014-06-06 22:27:50 +00:00
Alan Viverette
6adc4266c8
Material theme
...
BUG: 15467097
Change-Id: Icea9710a8733a0c79c114a56faa61db99b9723bd
2014-06-06 15:25:30 -07:00
Raphael Moll
fcabb6e7aa
am 95671f78: am 03afa4d6: Merge "Android USB driver: support 4EE7 (Nexus adb only)."
...
* commit '95671f78a5a32307aee79f3e86c62f92c26ac49a':
Android USB driver: support 4EE7 (Nexus adb only).
2014-06-06 22:23:19 +00:00
Raphael Moll
95671f78a5
am 03afa4d6: Merge "Android USB driver: support 4EE7 (Nexus adb only)."
...
* commit '03afa4d6719a52180f1d553590a4f33d5dd08377':
Android USB driver: support 4EE7 (Nexus adb only).
2014-06-06 22:07:30 +00:00
Alan Viverette
311bf2298e
am 14fba07c: (-s ours) DO NOT MERGE Material theme
...
* commit '14fba07cf0a8e112af288a9f92bc8458ec9a8b25':
DO NOT MERGE Material theme
2014-06-06 22:04:14 +00:00
Raphael Moll
03afa4d671
Merge "Android USB driver: support 4EE7 (Nexus adb only)."
2014-06-06 22:03:05 +00:00
Sreeram Ramachandran
732d646f51
Use the updated RouteInfo API.
...
Bug: 15142362
Bug: 13885501
Change-Id: I97f1625e037c889b0cddd3db418c42c1d48b26b9
2014-06-06 14:51:59 -07:00
Alan Viverette
14fba07cf0
DO NOT MERGE Material theme
...
BUG: 15467097
Change-Id: Icea9710a8733a0c79c114a56faa61db99b9723bd
2014-06-06 13:52:28 -07:00
Raphael Moll
700c6fd81d
Android USB driver: support 4EE7 (Nexus adb only).
...
Bug: b/14988808
Change-Id: Ib855f063c949649c059da09483f782d09fbf3d2c
2014-06-06 12:50:21 -07:00
Jesse Hall
319d36a9d1
am 6ed7e6df: am ea385828: am 3d1f0837: Merge "ndk: Remove extra GLES symbols on 64-bit platforms"
...
* commit '6ed7e6dfcc36a41ddface0527d1e4a2c053cc736':
ndk: Remove extra GLES symbols on 64-bit platforms
2014-06-06 16:37:08 +00:00
Jesse Hall
6ed7e6dfcc
am ea385828: am 3d1f0837: Merge "ndk: Remove extra GLES symbols on 64-bit platforms"
...
* commit 'ea3858285b2876d241218f9319cc256972160c1c':
ndk: Remove extra GLES symbols on 64-bit platforms
2014-06-06 16:32:44 +00:00
Jesse Hall
ea3858285b
am 3d1f0837: Merge "ndk: Remove extra GLES symbols on 64-bit platforms"
...
* commit '3d1f08375865a75ab6f67a45967cf9ad0c19ef72':
ndk: Remove extra GLES symbols on 64-bit platforms
2014-06-06 16:16:57 +00:00
Jesse Hall
3d1f083758
Merge "ndk: Remove extra GLES symbols on 64-bit platforms"
2014-06-06 16:13:37 +00:00
Jae Seo
ba490132c0
am 11d8830d: AtscInput: Update to the latest TV Input Framework API
...
* commit '11d8830d246e18e65072613ec86e1c0aaf4070df':
AtscInput: Update to the latest TV Input Framework API
2014-06-06 12:36:02 +00:00
Craig Stout
cfd0b3b2b7
am d55d61fd: Remove deprecated Params from BrowseAnimationFragment.
...
* commit 'd55d61fd166ef08c43d3d7f22080c52a98313621':
Remove deprecated Params from BrowseAnimationFragment.
2014-06-06 12:36:01 +00:00
Jesse Hall
3bcccf420f
ndk: Add GLES 3.1 and AEP extensions to NDK libGLESv3.so
...
Also update existing GLES2 and GLES3 headers to latest official
Khronos versions.
Bug: 15028495
Change-Id: Iecdc1d2cc23fbe10f225511536fb0bd46d11af4a
2014-06-05 21:28:16 -07:00
Jesse Hall
acda0020dd
ndk: Remove extra GLES symbols on 64-bit platforms
...
The original arch-arm libGLESv1_CM.so and libGLESv2.so symbols in
android-4 and android-5 were correct. They didn't include some vendor
extension symbols that are in the platform library but that apps
should query at runtime rather than link against.
When arch-x86 and arch-mips were added in android-9, they mistakenly
included these extension symbols. Oh well, for compatibility we can't
fix that now.
The android-20 symbols for all architectures were copied from x86 or
mips, and include the extension symbols. To avoid spreading the
mistake, this change:
(a) Removes the symbol files for architectures that existed in earlier
versions of the platform, since they shouldn't change in android-20.
(b) Removes the extension symbols on 64-bit platforms, so they match
the symbols in arch-arm.
(cherry picked from commit 74439535fa71e38a19734406b69af63773997edc)
Change-Id: Id675df1a1e2c43d74fee672be33357ffd1723fd0
2014-06-05 21:28:00 -07:00
Jae Seo
11d8830d24
AtscInput: Update to the latest TV Input Framework API
...
- Commented out setAvailable() until a new design is proposed.
- Changed TvInputSessionImpl to Session.
- Renamed onSetVolume() to onSetStreamVolume().
Change-Id: I3137ca5514c65b24f35f5ab79e40fa08af0c354f
2014-06-06 10:55:18 +09:00
Jesse Hall
2433ffdef5
ndk: Remove extra GLES symbols on 64-bit platforms
...
The original arch-arm libGLESv1_CM.so and libGLESv2.so symbols in
android-4 and android-5 were correct. They didn't include some vendor
extension symbols that are in the platform library but that apps
should query at runtime rather than link against.
When arch-x86 and arch-mips were added in android-9, they mistakenly
included these extension symbols. Oh well, for compatibility we can't
fix that now.
The android-20 symbols for all architectures were copied from x86 or
mips, and include the extension symbols. To avoid spreading the
mistake, this change:
(a) Removes the symbol files for architectures that existed in earlier
versions of the platform, since they shouldn't change in android-20.
(b) Removes the extension symbols on 64-bit platforms, so they match
the symbols in arch-arm.
Change-Id: Ib227d9d163bfe2859b13eb57dc19518d3a3f90d0
2014-06-05 18:36:32 -07:00
Craig Stout
84040d31c0
am 04e6d2d1: Remove use of deprecated Params.
...
* commit '04e6d2d1d94527a76b911dd718a45752707d2104':
Remove use of deprecated Params.
2014-06-05 00:06:56 +00:00
Raphael Moll
df72a54f9c
am adcf12ed: am 4000df93: am 6ab8ef21: Merge "Move SDK system-image source.prop_templates in their own folder."
...
* commit 'adcf12ed0864d17937a358b18a609a611cfa8bf5':
Move SDK system-image source.prop_templates in their own folder.
2014-06-04 22:01:47 +00:00
Raphael Moll
adcf12ed08
am 4000df93: am 6ab8ef21: Merge "Move SDK system-image source.prop_templates in their own folder."
...
* commit '4000df931bb1b0f9a9e37430212124a9c37e6972':
Move SDK system-image source.prop_templates in their own folder.
2014-06-04 21:58:54 +00:00
Raphael Moll
4000df931b
am 6ab8ef21: Merge "Move SDK system-image source.prop_templates in their own folder."
...
* commit '6ab8ef21b8826b19e92a47f70d3ba30e04ba66cc':
Move SDK system-image source.prop_templates in their own folder.
2014-06-04 21:46:13 +00:00
Raphael Moll
6ab8ef21b8
Merge "Move SDK system-image source.prop_templates in their own folder."
2014-06-04 21:30:14 +00:00
Craig Stout
d55d61fd16
Remove deprecated Params from BrowseAnimationFragment.
...
Change-Id: Ia8d77eaea96b2586c8c617bbcca34fea4ee76e5d
2014-06-04 14:14:02 -07:00
Glenn Kasten
a16dfb7878
Update OpenSLES_Android.h for API 20
...
All other include/SLES/*.h are unchanged since API 14
Change-Id: If4be7449fc8866ee630dd7986d3ee0d6a48549d4
2014-06-04 12:47:40 -07:00
Marco Nelissen
8db292b202
am 9cfe0a64: (-s ours) Merge "NDK files - do not merge" into lmp-preview-dev
...
* commit '9cfe0a64c5d4501d2663a584fdffc4fa7851db51':
NDK files - do not merge
2014-06-04 18:44:20 +00:00
Dake Gu
6b1715b5b6
am 7084b28f: Merge "SupportLeanbackDemo: example of add/remove items/rows" into lmp-preview-dev
...
* commit '7084b28f8d51c1b3e36fa006fd4c9cbb07c9337b':
SupportLeanbackDemo: example of add/remove items/rows
2014-06-04 18:43:32 +00:00
Steve Moyer
018aebe62f
am aed52549: (-s ours) am d87e9d35: (-s ours) am e561dd48: (-s ours) DO NOT MERGE: fix package for AndroidJUnitRunner
...
* commit 'aed525497fa0ee031d647d1478a3843b8e675ebd':
DO NOT MERGE: fix package for AndroidJUnitRunner
2014-06-04 17:42:21 +00:00