LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,788 Commits 2 Branches 0 Tags
04ca30ea4caa3f54229f2a58bedcff3a6e9e20ef
Commit Graph

14788 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Steve Moyer
5405d94a47 am 0e4895c4: (-s ours) Merge "DO NOT MERGE: fix package for AndroidJUnitRunner" into stage-aosp-master 
* commit '0e4895c43d8a194a664b25d52abf6842e9c7335e':
  DO NOT MERGE: fix package for AndroidJUnitRunner
 2014-06-17 17:39:25 +00:00
Steve Moyer
cd4e61bafc am b5d6adee: (-s ours) Merge "DO NOT MERGE: Add SmsTest and mege emulator smoke tests" into stage-aosp-master 
* commit 'b5d6adee6cea478c805d651718cca0fb5a72c4ce':
  DO NOT MERGE: Add SmsTest and mege emulator smoke tests
 2014-06-17 17:39:24 +00:00
Steve Moyer
0e4895c43d Merge "DO NOT MERGE: fix package for AndroidJUnitRunner" into stage-aosp-master 2014-06-17 05:00:50 +00:00
Steve Moyer
b5d6adee6c Merge "DO NOT MERGE: Add SmsTest and mege emulator smoke tests" into stage-aosp-master 2014-06-17 04:50:03 +00:00
Xavier Ducrohet
f892f789d3 am 06a5de5e: (-s ours) am 6c9d1af8: Merge "Remove non-ready support libs. DO NOT MERGE." into klp-modular-dev 
* commit '06a5de5e8b2844dc7d90a3c4789dad84477a3e22':
  Remove non-ready support libs. DO NOT MERGE.
 2014-06-17 01:47:50 +00:00
Xavier Ducrohet
06a5de5e8b am 6c9d1af8: Merge "Remove non-ready support libs. DO NOT MERGE." into klp-modular-dev 
* commit '6c9d1af8213394eb9458e71f2e6d62c4de716902':
  Remove non-ready support libs. DO NOT MERGE.
 2014-06-17 01:27:24 +00:00
Xavier Ducrohet
3be08760da am 44602376: Merge "RC version for build-tools." into lmp-preview-dev 
* commit '44602376adfca1c2c3c54af2bc4c905a8f486225':
  RC version for build-tools.
 2014-06-17 01:23:39 +00:00
Elliott Hughes
397b713d36 am 71905c9b: Fix build by removing libportable from the default build. 
* commit '71905c9b6978a6ec64b78372600656a17ad453cb':
  Fix build by removing libportable from the default build.
 2014-06-17 00:23:59 +00:00
Elliott Hughes
71905c9b69 Fix build by removing libportable from the default build. 
Easier than working out how to fix the fenv stuf...

(cherry picked from commit cbe970b82a)

Change-Id: I152f37498f72d2740150bf4ff3a9f53ceb36211e
 2014-06-16 16:51:45 -07:00
Ying Wang
78e75a9abf Build system API stubs. 
Run "make android_system_stubs" to build the system API jar file.

Change-Id: I0c221e110683f9315f4082e68ed3835162f91320
 2014-06-16 15:04:22 -07:00
Elliott Hughes
7ed02dc7bd resolved conflicts for merge of bb8886eb to master 
Change-Id: I6a0dec6ffc4b32d5db60aba5ed412238e85290d9
 2014-06-16 13:10:32 -07:00
Raphael Moll
ef55368439 am 600d07bc: am 2ed3edb6: SDK samples package 20 revision 1 
* commit '600d07bcb444943d692a46773d192371c58be0e5':
  SDK samples package 20 revision 1
 2014-06-16 18:11:34 +00:00
Raphael Moll
38e32bfdab am fe00e393: Merge "SDK samples package 20 revision 1" into lmp-preview-dev 
* commit 'fe00e3932d4ef7736d50932953114883410d1ab0':
  SDK samples package 20 revision 1
 2014-06-16 17:55:23 +00:00
Elliott Hughes
bb8886eb20 am c1168dc4: am 04a53e2f: Merge "Use ANDROID_TOOLCHAIN and ANDROID_TOOLCHAIN_2ND_ARCH in \'stack\'." 
* commit 'c1168dc4c3ce69f11f0cefe44cfec737ab254cec':
  Use ANDROID_TOOLCHAIN and ANDROID_TOOLCHAIN_2ND_ARCH in 'stack'.
 2014-06-16 17:53:52 +00:00
Elliott Hughes
c1168dc4c3 am 04a53e2f: Merge "Use ANDROID_TOOLCHAIN and ANDROID_TOOLCHAIN_2ND_ARCH in \'stack\'." 
* commit '04a53e2fd7d5331a1977a0e305b883e84a7825b9':
  Use ANDROID_TOOLCHAIN and ANDROID_TOOLCHAIN_2ND_ARCH in 'stack'.
 2014-06-16 17:49:03 +00:00
Raphael Moll
600d07bcb4 am 2ed3edb6: SDK samples package 20 revision 1 
* commit '2ed3edb6c91ff9d7054c545812e158656298b070':
  SDK samples package 20 revision 1
 2014-06-16 17:39:41 +00:00
Elliott Hughes
04a53e2fd7 Merge "Use ANDROID_TOOLCHAIN and ANDROID_TOOLCHAIN_2ND_ARCH in 'stack'." 2014-06-16 17:32:31 +00:00
Elliott Hughes
0836593b85 Use ANDROID_TOOLCHAIN and ANDROID_TOOLCHAIN_2ND_ARCH in 'stack'. 
This fixes the bug where we can't (currently) find the toolchain
for arm because it's at a different GCC version (4.8) from arm64 (4.9).

Change-Id: I22351af55298255f3ac4adfcae7e20080712fba4
 2014-06-16 10:40:22 -07:00
Raphael Moll
ebb5b87700 am 14023aee: Fix SDK repo to prevent mixing different targets. 
* commit '14023aeef171624677f95f1a2edb7f251ce30529':
  Fix SDK repo to prevent mixing different targets.
 2014-06-16 17:28:49 +00:00
Raphael Moll
d3b0b6d260 am 16691097: Move SDK system-image source.prop_templates in their own folder. 
* commit '16691097052ccc028e4c1d0b4c20b2111e73c0ad':
  Move SDK system-image source.prop_templates in their own folder.
 2014-06-16 17:28:46 +00:00
Steve Moyer
a0fe65e088 DO NOT MERGE: fix package for AndroidJUnitRunner 
Change-Id: I6b3fb006212f273d018121800d1d94e8a8d7404d
 2014-06-16 09:55:38 -07:00
Steve Moyer
d0e4e438b9 DO NOT MERGE: Add SmsTest and mege emulator smoke tests 
Picked Changes:
Add SMS test to verify emulator can receive sms from DDMS
Adding test tag to sms test
Add up to 6 10 second delays to wait for sms
Merging emulator smoke test projects
Combining SmsTest, GpsLocationTests, and ConnectivityTest

Conflicts:
	build/sdk.atree

Change-Id: I1343c59418a69b2f5e1eb0c6cde54f2bc09300ac
 2014-06-16 09:54:37 -07:00
Xavier Ducrohet
6c9d1af821 Merge "Remove non-ready support libs. DO NOT MERGE." into klp-modular-dev 2014-06-16 15:46:16 +00:00