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

14811 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Hsieh
9c4920b3a6 am 4e6ebfdd: am eacb09c3: am 5fcf5cfc: Merge "Refresh 64-bit headers/libs (WW25)" 
* commit '4e6ebfdd46ba3124e405bcd88b4b47d888887400':
  Refresh 64-bit headers/libs (WW25)
 2014-06-21 10:36:41 +00:00
Andrew Hsieh
4e6ebfdd46 am eacb09c3: am 5fcf5cfc: Merge "Refresh 64-bit headers/libs (WW25)" 
* commit 'eacb09c3dabd11af4d9bb9cb9080a28e7b256f08':
  Refresh 64-bit headers/libs (WW25)
 2014-06-21 09:46:39 +00:00
Andrew Hsieh
eacb09c3da am 5fcf5cfc: Merge "Refresh 64-bit headers/libs (WW25)" 
* commit '5fcf5cfc02cb36523886c916ff214165def9a5d4':
  Refresh 64-bit headers/libs (WW25)
 2014-06-21 04:21:13 +00:00
Andrew Hsieh
5fcf5cfc02 Merge "Refresh 64-bit headers/libs (WW25)" 2014-06-21 03:13:40 +00:00
Xavier Ducrohet
043a8dd414 am b931fca7: resolved conflicts for merge of f78598f7 to klp-modular-dev-plus-aosp 
* commit 'b931fca7ebde805e8f070e25f5d8bda774a4614b':
  Fix repo script to ignore tools. DO NOT MERGE.
 2014-06-21 00:57:00 +00:00
Xavier Ducrohet
b931fca7eb resolved conflicts for merge of f78598f7 to klp-modular-dev-plus-aosp 
Change-Id: I8657c95b169320957629b492fef11994227b3c56
 2014-06-20 17:51:14 -07:00
smain@google.com
408a6ba505 am 0a174127: am 295d2106: add redirects for Edu for FAQ and Guidelines pages 
* commit '0a17412796f2a3da62aef6660fd6706c003e4ab4':
  add redirects for Edu for FAQ and Guidelines pages
 2014-06-20 23:14:24 +00:00
Andrew Hsieh
1b1f01913c Refresh 64-bit headers/libs (WW25) 
To bionic: 06366724d572ef005f5bc0ddd8ad46794cbfad3b

Change-Id: I4c676127d357445fc5d09a2c82c5664238105b90
 2014-06-20 15:32:42 -07:00
smain@google.com
0a17412796 am 295d2106: add redirects for Edu for FAQ and Guidelines pages 
* commit '295d21062a8a99d5ed31270034e05a38a88f66e9':
  add redirects for Edu for FAQ and Guidelines pages
 2014-06-20 22:30:05 +00:00
Chris Craik
c8fed46b76 Merge "Add Shadow demos to ApiDemos" 2014-06-20 21:00:34 +00:00
Trevor Johns
4a71ff571d am ee811814: Update sdk.atree with new samples for LMP Preview release 
* commit 'ee8118144402226bb3fda9c78a27de43140e92ad':
  Update sdk.atree with new samples for LMP Preview release
 2014-06-20 19:14:22 +00:00
Xavier Ducrohet
f78598f754 Fix repo script to ignore tools. DO NOT MERGE. 
(cherry picked from commit d81eb5d833)

Change-Id: I7dbd0db25b84a11c36fcd570935357b0e755555c
 2014-06-20 08:24:05 -07:00
Trevor Johns
ee81181444 Update sdk.atree with new samples for LMP Preview release 
Change-Id: I6bbafb05b39ee448bbe8f831bbbb58e364851c79
 2014-06-19 23:57:19 -07:00
smain@google.com
295d21062a add redirects for Edu for FAQ and Guidelines pages 
Change-Id: I9865272de026e29a51af84673a82f95565f8395d
 2014-06-19 19:18:01 -07:00
Xavier Ducrohet
662133ebc4 am a9d69c6e: Merge "Package custom hardware.ini with armeabi-v7a images." into lmp-preview-dev 
* commit 'a9d69c6e2c26fbd5b9a88a970d9af24abd72fa62':
  Package custom hardware.ini with armeabi-v7a images.
 2014-06-20 00:44:29 +00:00
Xavier Ducrohet
a9d69c6e2c Merge "Package custom hardware.ini with armeabi-v7a images." into lmp-preview-dev 2014-06-20 00:01:43 +00:00
Xavier Ducrohet
7daf61b9b9 Package custom hardware.ini with armeabi-v7a images. 
Change-Id: I60d88374d0caba57f9ab3c589c758d983c099c2f
 2014-06-19 17:16:00 -07:00
Brian Carlstrom
70b9e412bd am af64fa58: am ef3d4ea0: am 2f43b93f: Merge "Replace libdvm reference with libart" 
* commit 'af64fa580e6b3e250f0e3be7af09f462e553763e':
  Replace libdvm reference with libart
 2014-06-19 23:21:17 +00:00
Brian Carlstrom
af64fa580e am ef3d4ea0: am 2f43b93f: Merge "Replace libdvm reference with libart" 
* commit 'ef3d4ea038690127ca6c685017fea6fb3aeaf61d':
  Replace libdvm reference with libart
 2014-06-19 23:17:16 +00:00
Brian Carlstrom
ef3d4ea038 am 2f43b93f: Merge "Replace libdvm reference with libart" 
* commit '2f43b93fabb8f16e68825fb0476f947ab981ea56':
  Replace libdvm reference with libart
 2014-06-19 23:13:00 +00:00
Brian Carlstrom
2f43b93fab Merge "Replace libdvm reference with libart" 2014-06-19 20:38:20 +00:00
Brian Carlstrom
a79fd769c1 Replace libdvm reference with libart 
Bug: 14298175
Change-Id: Ia4ff2af37e977be5d03d2d6e118e8b89d607a732
 2014-06-19 14:11:09 -07:00
Chris Craik
7007035ef1 Add Shadow demos to ApiDemos 
bug:15724818
Change-Id: I22e3faaee9bb1d46f9c9f16cac38069071e1fc0b
 2014-06-19 11:06:28 -07:00
Tor Norbye
04ca30ea4c resolved conflicts for merge of 8ec50062 to master 
Change-Id: Iaf036e9e6fff921a8babeab03b669377a308595f
 2014-06-18 12:05:15 -07:00
Tor Norbye
8ec5006267 Update api-versions.xml for LMP preview 
This file is used by lint to flag calls and field accesses
that were introduced in an API level higher than the current
minSdkVersion of the app.

Change-Id: I627f9df35cc4a04045b2a5219c2738c1031b6864
 2014-06-18 10:36:20 -07:00
Xavier Ducrohet
bb6f104abc am 3e36464b: Fix build: include sqlite3 in sdk builds. 
* commit '3e36464bbcccb88906be2cf89d1b323aa83e9c0f':
  Fix build: include sqlite3 in sdk builds.
 2014-06-18 10:18:37 +00:00
Xavier Ducrohet
c477cf4124 am 4049f60a: Fix windows build. 
* commit '4049f60aa764817ea0d70b8292b3503e19762839':
  Fix windows build.
 2014-06-18 10:18:34 +00:00
Xavier Ducrohet
20edcd3b33 am ebacf02e: Use renderscript prebuilts for windows. 
* commit 'ebacf02e88f7ec2bf77b671d14e1d524a2786e1b':
  Use renderscript prebuilts for windows.
 2014-06-18 10:18:14 +00:00
Xavier Ducrohet
3e36464bbc Fix build: include sqlite3 in sdk builds. 
This just enables sqlite3 to be build, doesn't
mean it gets packaged. (still controlled through
the atree).

Change-Id: Idf762427a0832dcb02586393cf92904d61d663db
 2014-06-18 00:33:21 -07:00
Xavier Ducrohet
4049f60aa7 Fix windows build. 
Windows build is based on linux and it needs
to delete the linux executable. sqlite3 moved
from tools to platform-tools so we need to delete it
from the right folder.

Change-Id: Ifae3b0e8972ba7ca316e6e8fd7908f6c8c11a271
 2014-06-17 22:01:07 -07:00
Xavier Ducrohet
ebacf02e88 Use renderscript prebuilts for windows. 
Change-Id: Ie487ff571a8552a166742824ba43c4c445c432f5
 2014-06-17 21:36:30 -07:00
Xavier Ducrohet
e263f439b6 am 0f0b786b: Move sqlite3 to platform-tools. 
* commit '0f0b786b5af31a7794eacc66eedb252d72490d86':
  Move sqlite3 to platform-tools.
 2014-06-18 03:33:24 +00:00
Xavier Ducrohet
0f0b786b5a Move sqlite3 to platform-tools. 
This was in the SDK tools before but it's really part of
the platform.

Change-Id: I2a88d288aec6fd1556a28db58976fc1c889efd35
 2014-06-17 20:25:57 -07:00
Elliott Hughes
bca5775d97 am 0c3af5d8: am 6e21ec3f: am 9811d58e: Merge "Add the "Abort message:" line to the preserved stack output." 
* commit '0c3af5d8d1f7c9e94818c496c6f7e5a89359007d':
  Add the "Abort message:" line to the preserved stack output.
 2014-06-18 01:54:55 +00:00
Deepanshu Gupta
5fabfe1786 am 40c2c69b: (-s ours) resolved conflicts for merge of c91c719f to klp-modular-dev-plus-aosp 
* commit '40c2c69bd8a6fda34a3ed7d78cf53b092b0ffa67':
  Package renamed fonts. [DO NOT MERGE]
 2014-06-18 01:54:50 +00:00
Xavier Ducrohet
c5e962866b am 9a258bce: Revert "Revert "Add cardview to support extra package."" 
* commit '9a258bce2cc829e3e80acc4680d7c7fb361f1435':
  Revert "Revert "Add cardview to support extra package.""
 2014-06-18 00:42:39 +00:00
Elliott Hughes
0c3af5d8d1 am 6e21ec3f: am 9811d58e: Merge "Add the "Abort message:" line to the preserved stack output." 
* commit '6e21ec3fc9df759c1dd61408247847547f3501da':
  Add the "Abort message:" line to the preserved stack output.
 2014-06-18 00:40:32 +00:00
Elliott Hughes
6e21ec3fc9 am 9811d58e: Merge "Add the "Abort message:" line to the preserved stack output." 
* commit '9811d58e78e6485c5d006331bcf7ae0716af061a':
  Add the "Abort message:" line to the preserved stack output.
 2014-06-18 00:37:06 +00:00
Deepanshu Gupta
40c2c69bd8 resolved conflicts for merge of c91c719f to klp-modular-dev-plus-aosp 
Change-Id: I0c942398f6acecf072da1a2148fbc900a609e870
 2014-06-17 17:27:29 -07:00
Deepanshu Gupta
c91c719f91 am dd2dac36: am edf631de: Package renamed fonts. [DO NOT MERGE] 
* commit 'dd2dac3659cad1594ce3a72f10b1216424b62441':
  Package renamed fonts. [DO NOT MERGE]
 2014-06-18 00:15:40 +00:00
Deepanshu Gupta
dd2dac3659 am edf631de: Package renamed fonts. [DO NOT MERGE] 
* commit 'edf631dee4edd3c44cd4156ccb7974090c89b65d':
  Package renamed fonts. [DO NOT MERGE]
 2014-06-18 00:10:42 +00:00
Xavier Ducrohet
de91aa6a87 am fffa1541: Revert "Add cardview to support extra package." 
* commit 'fffa1541f10acef428b9b370b4b78b55c72fa306':
  Revert "Add cardview to support extra package."
 2014-06-17 23:15:15 +00:00
Xavier Ducrohet
9a258bce2c Revert "Revert "Add cardview to support extra package."" 
Also add cardview to the list of support lib in
build/Android.mk

This reverts commit fffa1541f1.

Change-Id: I25bf7ce9d42894933f3cbdf2cc8ae2369945b35b
 2014-06-17 16:14:47 -07:00
Xavier Ducrohet
fffa1541f1 Revert "Add cardview to support extra package." 
This reverts commit 1e396a5975.
 2014-06-17 16:09:48 -07:00
Elliott Hughes
9811d58e78 Merge "Add the "Abort message:" line to the preserved stack output." 2014-06-17 20:49:57 +00:00
Elliott Hughes
d2471c871f Add the "Abort message:" line to the preserved stack output. 
When QA paste a stack in to the decoder, we don't want to lose the
abort message.

Bug: 15701333
Change-Id: I538aab6b5cb6c20534b1b7027aec32bd78ee060c
 2014-06-17 16:55:10 -07:00
Xavier Ducrohet
af91cc72df am 1e396a59: Add cardview to support extra package. 
* commit '1e396a59756dd9900d1cacb14c1cd07ac4901453':
  Add cardview to support extra package.
 2014-06-17 19:21:50 +00:00
Xavier Ducrohet
1e396a5975 Add cardview to support extra package. 
Change-Id: I796857c19ff466d0d84b9c9901273068510c3fb6
 2014-06-17 12:12:16 -07:00
Steve Moyer
a668dc625f am 5405d94a: (-s ours) am 0e4895c4: (-s ours) Merge "DO NOT MERGE: fix package for AndroidJUnitRunner" into stage-aosp-master 
* commit '5405d94a47f7f48ef43aeca0e3b5e7ca56ac6b39':
  DO NOT MERGE: fix package for AndroidJUnitRunner
 2014-06-17 18:06:36 +00:00
Steve Moyer
f30f3f3ecf am cd4e61ba: (-s ours) am b5d6adee: (-s ours) Merge "DO NOT MERGE: Add SmsTest and mege emulator smoke tests" into stage-aosp-master 
* commit 'cd4e61bafcb01f4bb70b5209f5994b6fffda6640':
  DO NOT MERGE: Add SmsTest and mege emulator smoke tests
 2014-06-17 18:06:34 +00:00