Commit Graph

15285 Commits

Author SHA1 Message Date
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
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
George Mount
7033a59303 API Review: Change View viewName attribute to transitionName.
Bug 15548520

Change-Id: Ie1c9fedfb1ff7e3b4e16435f71fc9df4b9107636
2014-06-20 07:38:06 -07:00
Trevor Johns
ee81181444 Update sdk.atree with new samples for LMP Preview release
Change-Id: I6bbafb05b39ee448bbe8f831bbbb58e364851c79
2014-06-19 23:57:19 -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
Xavier Ducrohet
662133ebc4 am a9d69c6e: Merge "Package custom hardware.ini with armeabi-v7a images." into lmp-preview-dev
* commit 'a9d69c6e2c26fbd5b9a88a970d9af24abd72fa62':
  Package custom hardware.ini with armeabi-v7a images.
2014-06-20 00:44:29 +00:00
Xavier Ducrohet
a9d69c6e2c Merge "Package custom hardware.ini with armeabi-v7a images." into lmp-preview-dev 2014-06-20 00:01:43 +00:00
Xavier Ducrohet
7daf61b9b9 Package custom hardware.ini with armeabi-v7a images.
Change-Id: I60d88374d0caba57f9ab3c589c758d983c099c2f
2014-06-19 17:16:00 -07:00
Adam Lesinski
0f2beb163a Fix incorrect external resource creation
ID resources were being created in the external 'android' package.

Change-Id: I35b5b2bb03bb093ade0c3c5dd1f22bd1269fdc6b
2014-06-19 16:29:56 -07:00
Brian Carlstrom
70b9e412bd am af64fa58: am ef3d4ea0: am 2f43b93f: Merge "Replace libdvm reference with libart"
* commit 'af64fa580e6b3e250f0e3be7af09f462e553763e':
  Replace libdvm reference with libart
2014-06-19 23:21:17 +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
ef3d4ea038 am 2f43b93f: Merge "Replace libdvm reference with libart"
* commit '2f43b93fabb8f16e68825fb0476f947ab981ea56':
  Replace libdvm reference with libart
2014-06-19 23:13:00 +00:00
Ji-Hwan Lee
efbbd1d98b Merge "Fix sdk builds" into klp-modular-dev-plus-aosp 2014-06-19 23:04:31 +00:00
Ji-Hwan Lee
5cd3de1cc6 Fix sdk builds
Change-Id: Ifca3f430795bf002ecc7bf77b38c2336e578c5fc
2014-06-21 17:19:49 +09: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
Ji-Hwan Lee
e3e3de0cef Fix sdk build, really this time
Change-Id: I5cddf63a6dc30dee5185a3a6a4e352c574a87213
2014-06-22 04:26:56 +09: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
Chris Craik
7007035ef1 Add Shadow demos to ApiDemos
bug:15724818
Change-Id: I22e3faaee9bb1d46f9c9f16cac38069071e1fc0b
2014-06-19 11:06:28 -07:00
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