LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,555 Commits 2 Branches 0 Tags
4e6ebfdd46ba3124e405bcd88b4b47d888887400
Commit Graph

13555 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
b931fca7eb resolved conflicts for merge of f78598f7 to klp-modular-dev-plus-aosp 
Change-Id: I8657c95b169320957629b492fef11994227b3c56
 2014-06-20 17:51:14 -07: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
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
smain@google.com
295d21062a add redirects for Edu for FAQ and Guidelines pages 
Change-Id: I9865272de026e29a51af84673a82f95565f8395d
 2014-06-19 19:18:01 -07: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
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
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
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
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
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
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
Raphael Moll
2ed3edb6c9 SDK samples package 20 revision 1 
Change-Id: I11f1bdeb7c1f5755962fd923556d778b8c3fa3cd
 2014-06-14 18:48:30 -07:00
Elliott Hughes
3f5337f9e6 am 1b0d9bf1: am 8b1c1b30: Merge "Updating stack_core.py to recognize new ABI output from debuggerd." 
* commit '1b0d9bf1333e8c2e77d4c3b5ab45aa35f3fccf17':
  Updating stack_core.py to recognize new ABI output from debuggerd.
 2014-06-14 00:53:06 +00:00
Elliott Hughes
1b0d9bf133 am 8b1c1b30: Merge "Updating stack_core.py to recognize new ABI output from debuggerd." 
* commit '8b1c1b304203544bed76786064d685ec06e95593':
  Updating stack_core.py to recognize new ABI output from debuggerd.
 2014-06-14 00:48:59 +00:00
Elliott Hughes
8b1c1b3042 Merge "Updating stack_core.py to recognize new ABI output from debuggerd." 2014-06-13 21:10:05 +00:00
Brigid Smith
45a46c6138 Updating stack_core.py to recognize new ABI output from debuggerd. 
Change-Id: Ib9736a0509edb97be15f5e89dbc3a5188e744416
 2014-06-13 17:43:38 -07:00
Andrew Hsieh
dfed70acff am 2a97fd08: am e577c6b4: Merge "Fix ssize_t, WCHAR_MIN and WCHAR_MAX" 
* commit '2a97fd08a772d93b3354eebb1281b8a708d31a17':
  Fix ssize_t, WCHAR_MIN and WCHAR_MAX
 2014-06-13 19:09:31 +00:00
Andrew Hsieh
2a97fd08a7 am e577c6b4: Merge "Fix ssize_t, WCHAR_MIN and WCHAR_MAX" 
* commit 'e577c6b4e3fbc35768f400b40951f43e88a61033':
  Fix ssize_t, WCHAR_MIN and WCHAR_MAX
 2014-06-13 19:05:27 +00:00
Andrew Hsieh
bd92c406a5 am 31a7026b: am 724e3468: Merge "Update libm_hard.a" 
* commit '31a7026b66877c1166fb7d6e77ad17367e5698e3':
  Update libm_hard.a
 2014-06-13 16:35:44 +00:00
Andrew Hsieh
31a7026b66 am 724e3468: Merge "Update libm_hard.a" 
* commit '724e34687c3cf77946fe94c7e655e7ab5e0f7124':
  Update libm_hard.a
 2014-06-13 16:32:37 +00:00
Deepanshu Gupta
edf631dee4 Package renamed fonts. [DO NOT MERGE] 
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
(cherry picked from commit 4100ca144d)
 2014-06-12 15:27:57 -07:00
smain@google.com
2274fcaa08 am f60cdb2e: add redirects for new sdk workflow organization as per: If8a8855bdb8e8ec9b0eefedd35ae24ea60497741 
* commit 'f60cdb2e50c3cfbee3d9d3cef2dd67aa72d150b5':
  add redirects for new sdk workflow organization as per: If8a8855bdb8e8ec9b0eefedd35ae24ea60497741
 2014-06-12 19:04:37 +00:00
smain@google.com
f60cdb2e50 add redirects for new sdk workflow organization 
as per: If8a8855bdb8e8ec9b0eefedd35ae24ea60497741

Change-Id: Id47ba34ab99cdc6aa494e9b54f69066670f9e570
 2014-06-11 20:34:09 -07:00
Andrew Hsieh
724e34687c Merge "Update libm_hard.a" 2014-06-12 03:32:07 +00:00
Xavier Ducrohet
e2172b71fc Remove non-ready support libs. DO NOT MERGE. 
Change-Id: I319e9cb26e5ebfaafb3aa209732914f90ddf1446
 2014-06-10 17:27:26 -07:00
Andrew Hsieh
e577c6b4e3 Merge "Fix ssize_t, WCHAR_MIN and WCHAR_MAX" 2014-06-10 21:55:12 +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