Ying Wang
567a46bf22
3rd attempt to build and store android_system.jar in sdk builds.
...
Change-Id: Ica053e3ef6e3190ab4dcc32b3b7d06fc4c619884
2014-07-18 09:16:40 -07:00
Ying Wang
c39b6ebb2f
"sdk" is not necessarily on the linux command line.
...
Bug: 16208466
Change-Id: I29f8763e9763d2b482744d0c7a74c122a299d03b
2014-07-17 21:18:09 -07:00
Ying Wang
c41276ede6
Build and store android_system.jar.
...
Bug: 16208466
Change-Id: Ibc078339dff56233a9f8f11228f5299ef389f967
2014-07-14 20:39:54 -07:00
Ying Wang
4391853b56
Fix win_sdk build.
...
Change-Id: I59ac4789b462f356811d0f7dc20d850bbc16dfaf
2014-07-11 11:16:32 -07:00
Griff Hazen
6c3cef6e70
am b3ae9165: am 96f19c45: Sample showing how to embed a wearable app into a phone
...
* commit 'b3ae91650a49da7453a95ab8c72461d4897c5ccb':
Sample showing how to embed a wearable app into a phone
2014-06-24 21:04:48 +00:00
Dan Aminzade
59167edab0
am 2c603516: am 9fd71d61: Add new SynchronizedNotifications sample.
...
* commit '2c6035162e1509651871c5d88ff87c434ba6c56e':
Add new SynchronizedNotifications sample.
2014-06-24 21:04:47 +00:00
Griff Hazen
b3ae91650a
am 96f19c45: Sample showing how to embed a wearable app into a phone
...
* commit '96f19c456f3eafea5ab267b13dfceae1c75964eb':
Sample showing how to embed a wearable app into a phone
2014-06-24 21:00:20 +00:00
Dan Aminzade
2c6035162e
am 9fd71d61: Add new SynchronizedNotifications sample.
...
* commit '9fd71d61f262bfe238b58c60fab6e6494b028356':
Add new SynchronizedNotifications sample.
2014-06-24 21:00:19 +00:00
Griff Hazen
96f19c456f
Sample showing how to embed a wearable app into a phone
...
With a keystore present.
Change-Id: I3693f8c4b7ff09fe2fc3023bfe561b929333b8a4
2014-06-23 15:36:51 -07:00
Dan Aminzade
9fd71d61f2
Add new SynchronizedNotifications sample.
...
This sample demonstrates how to use DataItems to construct linked
phone- and wearable-side notifications.
Change-Id: I6defa7fad671ba2ec0de25c8913abd66d07846a2
2014-06-23 15:32:56 -07:00
Xavier Ducrohet
d732021a67
am 3b024f09: Fix packaging of cardview for non-maven extra package.
...
* commit '3b024f09a4e7c1bb8a386894de6073e720fed257':
Fix packaging of cardview for non-maven extra package.
2014-06-23 19:46:07 +00:00
Xavier Ducrohet
3b024f09a4
Fix packaging of cardview for non-maven extra package.
...
bug: 15770129
Change-Id: I26318b11bf0862c0796729740403c3d729e87ef6
2014-06-23 11:00:37 -07: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
Xavier Ducrohet
ac21950368
Add more tools to platform-tools
...
- etc1tool
- hprof-conv
- dmtracedump
These are platform tools rather than SDK Tools.
Change-Id: I75eb8ea5404ef7ecf7104ecc9129cf439df0e51c
2014-06-21 14:56:38 -07:00
Mark Renouf
c788c7955d
am 73d0a375: am 2cba0745: Adds a GridViewPager sample wearable app
...
* commit '73d0a3759a97d0c242a0448957d344de9c412c47':
Adds a GridViewPager sample wearable app
2014-06-23 03:55:06 +00:00
Ji-Hwan Lee
7894d8eeac
am 5ece703b: Merge "Fix sdk build, really this time" into klp-modular-dev-plus-aosp
...
* commit '5ece703b190205243f9601a3eddb287ec808a084':
Fix sdk build, really this time
2014-06-22 16:49:42 +00:00
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
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
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
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
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
Griff Hazen
2def7d2a2a
Add first wearable sample to sdk atree
...
Bug: 15591212
Change-Id: Ic74e8e821d7941d403dc4d83aa33f23cf671c226
2014-06-20 16:04:46 -07: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
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
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
Trevor Johns
ee81181444
Update sdk.atree with new samples for LMP Preview release
...
Change-Id: I6bbafb05b39ee448bbe8f831bbbb58e364851c79
2014-06-19 23:57:19 -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
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
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
Xavier Ducrohet
4049f60aa7
Fix windows build.
...
Windows build is based on linux and it needs
to delete the linux executable. sqlite3 moved
from tools to platform-tools so we need to delete it
from the right folder.
Change-Id: Ifae3b0e8972ba7ca316e6e8fd7908f6c8c11a271
2014-06-17 22:01:07 -07:00
Xavier Ducrohet
ebacf02e88
Use renderscript prebuilts for windows.
...
Change-Id: Ie487ff571a8552a166742824ba43c4c445c432f5
2014-06-17 21:36:30 -07:00
Xavier Ducrohet
e263f439b6
am 0f0b786b: Move sqlite3 to platform-tools.
...
* commit '0f0b786b5af31a7794eacc66eedb252d72490d86':
Move sqlite3 to platform-tools.
2014-06-18 03:33:24 +00:00
Xavier Ducrohet
0f0b786b5a
Move sqlite3 to platform-tools.
...
This was in the SDK tools before but it's really part of
the platform.
Change-Id: I2a88d288aec6fd1556a28db58976fc1c889efd35
2014-06-17 20:25:57 -07:00
Xavier Ducrohet
c5e962866b
am 9a258bce: Revert "Revert "Add cardview to support extra package.""
...
* commit '9a258bce2cc829e3e80acc4680d7c7fb361f1435':
Revert "Revert "Add cardview to support extra package.""
2014-06-18 00:42:39 +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