LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,692 Commits 2 Branches 0 Tags
9e66bc405f64a7e0590cc2d9e7092f0c74ab4bd8
Commit Graph

14692 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
9e66bc405f am f7449cdb: Merge "Package renamed fonts again." into lmp-preview-dev 
* commit 'f7449cdb18aeef440c8b1e2d7e99ec9970fc7f8a':
  Package renamed fonts again.
 2014-06-12 16:54:21 +00:00
Glenn Kasten
f59aa1d223 Merge "Update OpenSLES_Android.h for API 20" 2014-06-11 21:23:31 +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
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
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
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
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
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