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

13599 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Griff Hazen
246dbde49a am 6cb66cf8: Switch wearable samples to gradle 0.12. 
* commit '6cb66cf80e3ab19f37efd8f35eb5a1debebc7d68':
  Switch wearable samples to gradle 0.12.
 2014-06-24 21:00:11 +00:00
Griff Hazen
6cb66cf80e Switch wearable samples to gradle 0.12. 
And remove unnecessary lint warning skips and noCompress 'apk'

Bug: 15827591
Change-Id: I862fa7188277ac7de0dca22ecf0d9129ca941ee5
 2014-06-23 14:41:03 -07:00
Ji-Hwan Lee
ad42c9e905 Proper resolution of conflict for 8062092a 
Bug: 15793651
Change-Id: Ib618a9eb179dae3e2284eb8cf19a2b9216345708
 2014-06-23 15:40:08 +09:00
Mark Renouf
73d0a3759a am 2cba0745: Adds a GridViewPager sample wearable app 
* commit '2cba0745a46ee260bfbe303fa89386ab5348604c':
  Adds a GridViewPager sample wearable app
 2014-06-23 03:53:22 +00:00
Mark Renouf
2cba0745a4 Adds a GridViewPager sample wearable app 
Change-Id: I014670493bb54bc1a6e3c1ecda716b9ea8d83412
 2014-06-22 21:24:55 -04:00
Griff Hazen
9872c0c7c0 Move all wearable samples to development/samples/wearable 
Update build.gradle to compile them all, and remove
gradle stopships.

Copied from vendor/google_clockwork klp-modular-dev as of:
01930cc85bc1ba974a412db7d3c9d17387702e16

Bug: 15591212
Bug: 15264403

Change-Id: I4d05c35c995e675d92039b1dfb2a33e454285af5
 2014-06-22 00:18:09 -07:00
Joe Fernandez
36a32cd683 resolved conflicts for merge of 9560aaec to klp-modular-dev 
Change-Id: I137c56182c00bca6f427bff5324db765017cf5ec
 2014-06-20 22:38:20 -07: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
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
Griff Hazen
2def7d2a2a Add first wearable sample to sdk atree 
Bug: 15591212

Change-Id: Ic74e8e821d7941d403dc4d83aa33f23cf671c226
 2014-06-20 16:04:46 -07: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
Raphael Moll
b706c44a2b Android USB driver: support 4EE7 (Nexus adb only). DO NOT MERGE. 
Bug: b/14988808

(cherry picked from commit 700c6fd81d)

Change-Id: I222a1858f6e46fa947e5b6ad9c48a7126d66ec70
 2014-06-20 08:35:49 -07:00
Raphael Moll
bf5ae62826 Android SDK Windows USB driver: Glass PID. DO NOT MERGE. 
(cherry picked from commit 260db8ce43)

Change-Id: I82a07ac7c13f25d14a876017ae47a6c3b765213d
 2014-06-20 08:29:45 -07:00
Raphael Moll
efbf1a3e28 SDK: support generating repository XML with latest XSD. DO NOT MERGE. 
The latest version of the repository XSD changes:
- archive attributes (os/arch) are now element (host-os)
- system images are not longer in the repository.xml and
  get their own XML file.

(cherry picked from commit ea40d2f4c5)

Change-Id: Id0363c446014a96a7f78c8e5500fae6092e97dc3
 2014-06-20 08:28:25 -07:00
Raphael Moll
8062092a46 Update revision of Android SDK USB driver for Windows. DO NOT MERGE. 
Rev 9 adds the Glass PID.

(cherry picked from commit 8221674986)

Change-Id: I63bb199b28c20fa791d3b1f9c70d8ea1633f9a6d
 2014-06-20 08:27:28 -07: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
Ji-Hwan Lee
5ece703b19 Merge "Fix sdk build, really this time" into klp-modular-dev-plus-aosp 2014-06-19 22:55:19 +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
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
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
Andrew Hsieh
2c3051d762 am c9e0acf2: Merge changes I653740e3,I554024e5 
* commit 'c9e0acf2ac736305a06cbc972c6e22be9be0740c':
  Restore arm's machine/endian.h to be useful for ARMv5
  Hard-float support in android-L/include/math.h
 2014-06-21 04:22:39 +00:00
Andrew Hsieh
d2988ef5b0 am e514118e: Merge "Fix samples for 64-bit ABIs" 
* commit 'e514118e03c861bd678709d7dbf671f879a44da0':
  Fix samples for 64-bit ABIs
 2014-06-21 04:22:38 +00:00
Andrew Hsieh
ea73893074 am 1b587c94: Merge "64-bit in android-L" 
* commit '1b587c943ec9eae4341e2f540611bc32d000e798':
  64-bit in android-L
 2014-06-21 04:22:32 +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
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
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
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