LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,313 Commits 2 Branches 0 Tags
ec2f91f54c254edbe0abe8b91beee6aefbffaa2f
Commit Graph

15313 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Griff Hazen
106d4ca41d am 5da8165a: am 9872c0c7: Move all wearable samples to development/samples/wearable 
* commit '5da8165a4600c62df835e9f59fc61e2d35c7eae4':
  Move all wearable samples to development/samples/wearable
 2014-06-22 09:52:31 +00:00
Griff Hazen
5da8165a46 am 9872c0c7: Move all wearable samples to development/samples/wearable 
* commit '9872c0c7c0383c0d940bab2862c9468af26ee638':
  Move all wearable samples to development/samples/wearable
 2014-06-22 09:02:21 +00:00
Xavier Ducrohet
620a756fcc am ac219503: Add more tools to platform-tools 
* commit 'ac21950368a56dbf1a378211e106d7c54056e4cc':
  Add more tools to platform-tools
 2014-06-21 22:29:31 +00:00
Joe Fernandez
ac4f02d269 am 7b7feee3: am 36a32cd6: resolved conflicts for merge of 9560aaec to klp-modular-dev 
* commit '7b7feee3cbb4a859c87f644e260160902ca52d61':
  Removing old, duplicate developer.android.com server configuration
 2014-06-21 20:19:15 +00:00
Griff Hazen
6d5f06db93 am bd6a37e8: am b6bca953: Add first wearable sample to sdk samples distribution 
* commit 'bd6a37e88f8b32fc3cb62c1ace83aa16546c0981':
  Add first wearable sample to sdk samples distribution
 2014-06-21 20:19:14 +00:00
Griff Hazen
1ad24024b3 am e46688e3: am 2def7d2a: Add first wearable sample to sdk atree 
* commit 'e46688e36ed645036d7283be54a9e7a5da311995':
  Add first wearable sample to sdk atree
 2014-06-21 20:19:13 +00:00
Raphael Moll
270a7b461a am 36f94250: (-s ours) am 3f3f34dc: (-s ours) Move SDK system-image source.prop_templates in their own folder. DO NOT MERGE. 
* commit '36f94250447da75428f409183e9faba2118bd5ae':
  Move SDK system-image source.prop_templates in their own folder. DO NOT MERGE.
 2014-06-21 20:19:12 +00:00
Raphael Moll
e14e50c346 am 58d9d419: (-s ours) am 71ad7c8f: (-s ours) Fix SDK repo to prevent mixing different targets. DO NOT MERGE. 
* commit '58d9d419eaca2fa15fe6c9411fc7b6da0bdeb118':
  Fix SDK repo to prevent mixing different targets. DO NOT MERGE.
 2014-06-21 20:19:11 +00:00
Raphael Moll
6f11b01396 am fa7e9337: (-s ours) am b706c44a: (-s ours) Android USB driver: support 4EE7 (Nexus adb only). DO NOT MERGE. 
* commit 'fa7e933739dc47935e087786ffa99754d0ae6d19':
  Android USB driver: support 4EE7 (Nexus adb only). DO NOT MERGE.
 2014-06-21 20:19:09 +00:00
Raphael Moll
2b3c0c9955 am b2d30f98: (-s ours) am bf5ae628: (-s ours) Android SDK Windows USB driver: Glass PID. DO NOT MERGE. 
* commit 'b2d30f98cfa12b17926e9015bfdbb6b2f8c1ddaa':
  Android SDK Windows USB driver: Glass PID. DO NOT MERGE.
 2014-06-21 20:19:08 +00:00
Raphael Moll
2d2c1b6088 am 12eb3224: (-s ours) am efbf1a3e: (-s ours) SDK: support generating repository XML with latest XSD. DO NOT MERGE. 
* commit '12eb322471a92f251f6d02996fbbb2e86d36d569':
  SDK: support generating repository XML with latest XSD. DO NOT MERGE.
 2014-06-21 20:19:07 +00:00
Joe Fernandez
7b7feee3cb am 36a32cd6: resolved conflicts for merge of 9560aaec to klp-modular-dev 
* commit '36a32cd68365b8cefea7669ed925cf5387a3b53a':
  Removing old, duplicate developer.android.com server configuration
 2014-06-21 20:16:33 +00:00
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
ebfd9306c1 am 767f57dc: resolved conflicts for 8062092a 
* commit '767f57dcaf7eedc012981a52f14e0ba7a286587f':
  Update revision of Android SDK USB driver for Windows. DO NOT MERGE.
 2014-06-21 19:53:11 +00:00
Ed Heyl
767f57dcaf resolved conflicts for 8062092a 
Change-Id: Ibbe3d25e62b2c59b4dc89b198915869b61da6bf5
 2014-06-21 12:50:04 -07:00
Ji-Hwan Lee
b791183533 am efbbd1d9: Merge "Fix sdk builds" into klp-modular-dev-plus-aosp 
* commit 'efbbd1d98b2e16b8f0e2413460dcde92c77faf5a':
  Fix sdk builds
 2014-06-21 17:00:01 +00:00
Andrew Hsieh
f49334ad54 am 6fa1424b: am 2c3051d7: am c9e0acf2: Merge changes I653740e3,I554024e5 
* commit '6fa1424bd53bd0cb005d158bf0fe65ae4882c8c9':
  Restore arm's machine/endian.h to be useful for ARMv5
  Hard-float support in android-L/include/math.h
 2014-06-21 10:36:51 +00:00
Andrew Hsieh
d9a37bc02f am 9a6226dc: am d2988ef5: am e514118e: Merge "Fix samples for 64-bit ABIs" 
* commit '9a6226dc6d4d5327767e89d7bcebba9aad253ab7':
  Fix samples for 64-bit ABIs
 2014-06-21 10:36:49 +00:00
Andrew Hsieh
081a7eb201 am 4b9e4a32: am ea738930: am 1b587c94: Merge "64-bit in android-L" 
* commit '4b9e4a3294cec41364d9b444066b812c82d20d35':
  64-bit in android-L
 2014-06-21 10:36:45 +00:00
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
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
Andrew Hsieh
e514118e03 Merge "Fix samples for 64-bit ABIs" 2014-06-21 03:13:40 +00:00
Andrew Hsieh
1b587c943e Merge "64-bit in android-L" 2014-06-21 03:13:40 +00:00
Andrew Hsieh
5fcf5cfc02 Merge "Refresh 64-bit headers/libs (WW25)" 2014-06-21 03:13:40 +00:00
Joe Fernandez
9560aaec8a am 2f5c9851: Removing old, duplicate developer.android.com server configuration 
* commit '2f5c98511397c0528fa710b4603b3322fdc4e7ba':
  Removing old, duplicate developer.android.com server configuration
 2014-06-21 02:37:38 +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
Andrew Hsieh
458300640f Fix samples for 64-bit ABIs 
1. Set APP_ABI:=all in almost all samples
2. Enhance hello-jni to report more ABIs
3. Fix warnings

Change-Id: I2851c42b77ef8225e32143d225edcf973633e782
 2014-06-20 16:42:08 -07:00
Andrew Hsieh
e75afa6aee 64-bit in android-L 
See https://android-review.googlesource.com/#/c/99021/

Change-Id: I10daf2da97aa9d3c99661b5d79080b96a0ae9f22
 2014-06-20 16:34:39 -07:00
Griff Hazen
b6bca95390 Add first wearable sample to sdk samples distribution 
Wearable samples sometimes have special gradle setups that nest
one application within another. As such, inclusion in the existing
samples generator may be tricky. Instead, just prepare the sample
for direct inclusion into the sdk distribution.

Create a convenience gradle build to build all wearable samples
at once.

Bug: 15591212
Change-Id: I6e03f7c5cc87909430b927aca4b403ded77917ab
 2014-06-20 16:31:07 -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
Griff Hazen
2def7d2a2a Add first wearable sample to sdk atree 
Bug: 15591212

Change-Id: Ic74e8e821d7941d403dc4d83aa33f23cf671c226
 2014-06-20 16:04:46 -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
Andrew Hsieh
c9e0acf2ac Merge changes I653740e3,I554024e5 
* changes:
  Restore arm's machine/endian.h to be useful for ARMv5
  Hard-float support in android-L/include/math.h
 2014-06-20 21:00:34 +00:00
Andrew Hsieh
0faa47e06d Restore arm's machine/endian.h to be useful for ARMv5 
Revert bionic c54ca40aef48009e7b0e5b2b3069aad62ffd3453 because
endian.h is seen by APP_ABI=armeabi as well.  Instruction
"rev" and "rev16" doesn't exist until ARMv6

Change-Id: I653740e3704b9b64e3e2a2e17452675635a14776
 2014-06-20 16:45:29 -07:00
Andrew Hsieh
1906050b84 Hard-float support in android-L/include/math.h 
Change-Id: I554024e5afb7a8be44fb2884ffe369992bd0a959
 2014-06-20 16:44:28 -07: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
Raphael Moll
3f3f34dc0e Move SDK system-image source.prop_templates in their own folder. DO NOT MERGE. 
This allows to have a different rule to generate the source.properties
based on the templates and place them in a directory that depends on
the current target CPU ABI. In turn this prevents the build from
mixing different source.props when building different targets.

Change-Id: I4a1d9f47426c94f376947ddae8be9f5549331616

Conflicts:
	build/sdk-android-arm64-v8a.atree
	build/sdk-android-x86.atree
	build/sdk-android-x86_64.atree
	sys-img/images_arm64-v8a_source.prop_template
	sys-img/images_x86_64_source.prop_template
 2014-06-20 08:49:37 -07:00
Raphael Moll
71ad7c8f4e Fix SDK repo to prevent mixing different targets. DO NOT MERGE. 
This makes sure that sdk-repo-*.zip doesn't exist to
avoid merging into an existing one.

Also fix a warning when generating the repo.xml files.

(cherry picked from commit 4df9f469f7)

Change-Id: I8ad6763ace0d6075a743b99fd65a5ae8b69bf3d5
 2014-06-20 08:38:23 -07:00