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

13766 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Griff Hazen
bd6a37e88f am b6bca953: Add first wearable sample to sdk samples distribution 
* commit 'b6bca953909d42a6284de4128d767eff8c9862ee':
  Add first wearable sample to sdk samples distribution
 2014-06-21 20:15:51 +00:00
Griff Hazen
e46688e36e am 2def7d2a: Add first wearable sample to sdk atree 
* commit '2def7d2a2a0e9eacf49819c9cba3e5b188b061c3':
  Add first wearable sample to sdk atree
 2014-06-21 20:15:49 +00:00
Raphael Moll
36f9425044 am 3f3f34dc: (-s ours) Move SDK system-image source.prop_templates in their own folder. DO NOT MERGE. 
* commit '3f3f34dc0e2da2330b5bbd7520450247aa31fca6':
  Move SDK system-image source.prop_templates in their own folder. DO NOT MERGE.
 2014-06-21 20:14:39 +00:00
Raphael Moll
58d9d419ea am 71ad7c8f: (-s ours) Fix SDK repo to prevent mixing different targets. DO NOT MERGE. 
* commit '71ad7c8f4ea7278f48e276c2f232c674b20f7384':
  Fix SDK repo to prevent mixing different targets. DO NOT MERGE.
 2014-06-21 20:14:38 +00:00
Raphael Moll
fa7e933739 am b706c44a: (-s ours) Android USB driver: support 4EE7 (Nexus adb only). DO NOT MERGE. 
* commit 'b706c44a2b7a600ade941668a50b4039fafa41f0':
  Android USB driver: support 4EE7 (Nexus adb only). DO NOT MERGE.
 2014-06-21 20:14:37 +00:00
Raphael Moll
b2d30f98cf am bf5ae628: (-s ours) Android SDK Windows USB driver: Glass PID. DO NOT MERGE. 
* commit 'bf5ae62826d567f0a7c17949138dc55372780c72':
  Android SDK Windows USB driver: Glass PID. DO NOT MERGE.
 2014-06-21 20:14:36 +00:00
Raphael Moll
12eb322471 am efbf1a3e: (-s ours) SDK: support generating repository XML with latest XSD. DO NOT MERGE. 
* commit 'efbf1a3e284f3ede5fc585efcbab8da961d8697b':
  SDK: support generating repository XML with latest XSD. DO NOT MERGE.
 2014-06-21 20:14:35 +00:00
Ed Heyl
767f57dcaf resolved conflicts for 8062092a 
Change-Id: Ibbe3d25e62b2c59b4dc89b198915869b61da6bf5
 2014-06-21 12:50:04 -07:00
Ji-Hwan Lee
e3e3de0cef Fix sdk build, really this time 
Change-Id: I5cddf63a6dc30dee5185a3a6a4e352c574a87213
 2014-06-22 04:26:56 +09:00
Ji-Hwan Lee
efbbd1d98b Merge "Fix sdk builds" into klp-modular-dev-plus-aosp 2014-06-19 23:04:31 +00:00
Andrew Hsieh
6fa1424bd5 am 2c3051d7: am c9e0acf2: Merge changes I653740e3,I554024e5 
* commit '2c3051d7625c01bc1916eae2853e014942f3b3e9':
  Restore arm's machine/endian.h to be useful for ARMv5
  Hard-float support in android-L/include/math.h
 2014-06-21 09:47:06 +00:00
Andrew Hsieh
9a6226dc6d am d2988ef5: am e514118e: Merge "Fix samples for 64-bit ABIs" 
* commit 'd2988ef5b0c44b12a5a542779b8bea5a99c29ebe':
  Fix samples for 64-bit ABIs
 2014-06-21 09:47:05 +00:00
Andrew Hsieh
4b9e4a3294 am ea738930: am 1b587c94: Merge "64-bit in android-L" 
* commit 'ea738930745abb58ce8a8c56a6fbd0c5119ba0ce':
  64-bit in android-L
 2014-06-21 09:46:59 +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
Ji-Hwan Lee
5cd3de1cc6 Fix sdk builds 
Change-Id: Ifca3f430795bf002ecc7bf77b38c2336e578c5fc
 2014-06-21 17:19:49 +09: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
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
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
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
36b225169a 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 35feaff496)
 2014-06-12 16:16:04 -07:00