Xavier Ducrohet
e67c313ea0
am 9ccbed21: am 86d28ad8: Add jack/jill/multidex lib to build-tools.
...
* commit '9ccbed2191c8b8dcca14e69e93b528c5f675f9c4':
Add jack/jill/multidex lib to build-tools.
2014-10-29 18:50:42 +00:00
Xavier Ducrohet
86d28ad8c1
Add jack/jill/multidex lib to build-tools.
...
Change-Id: Id8aad3a7ea808c5b2d1dd5c008f6202aefb7ef3b
2014-10-28 12:06:50 -07:00
Adam Lesinski
42aa7939a6
Enable building gtest for Windows
...
Change-Id: Ib4a865ca7716084498eff32e057865c0ffbced46
2014-10-24 18:40:35 +00:00
Joe Fernandez
de3f94a000
Merge "Deletes the wear samples that have been commited in the wrong place. Updates the location of wear samples in sdk.atree Adds SpeedTracker wear sample ( https://googleplex-android-review.git.corp.google.com/564608 )" into lmp-dev
2014-10-22 20:25:18 +00:00
Takeshi Hagikura
83642406f8
Deletes the wear samples that have been commited in the wrong place.
...
Updates the location of wear samples in sdk.atree
Adds SpeedTracker wear sample (https://googleplex-android-review.git.corp.google.com/564608 )
Change-Id: Icd27de8c7e72ed9508aa1350a0784d627e072154
2014-10-21 20:24:12 -07:00
Trevor Johns
f70fdf3c80
sdk.atree: Move JobScheduler sample from 'ui/views' to 'background'
...
Change-Id: Ibecdf48a2977ce52b198d626947ba71eba1ad2b9
2014-10-17 12:58:03 -07:00
Trevor Johns
36274ac53d
Add additional samples for L to sdk.atree
...
- RecyclerView
- CardView
- LNotifications
- DrawableTinting
- InterpolatorPlayground
- PdfRendererBasic
- FloatingActionButtonBasic
- RevealEffectBasic
Change-Id: Icea2e207311d60ad72c349c3a6a17439526661af
2014-10-17 12:05:30 -07:00
Trevor Johns
66b6f721b7
Merge "Update sdk.atree and samples_source.prop_template for L SDK release" into lmp-dev
2014-10-17 00:22:31 +00:00
Trevor Johns
b21dca0c15
Update sdk.atree and samples_source.prop_template for L SDK release
...
- Add new samples to sdk.atree
- Bump revision for samples_source.prop_template
Change-Id: I592d2457502dbd2458dec7879c5cea7320743378
2014-10-16 17:20:10 -07:00
Trevor Johns
ca8bc22a50
sdk.atree: Fix typo and remove legacy BluetoothChat sample
...
- Fixed typo: Renamed "MediaEffect" sample to "MediaEffects"
- Removed legacy BluetoothChat sample, since the templatized version
has now been checked in.
Change-Id: I1b5e48f41a3daa171d70bac765cfba2ece9dd088
2014-10-16 00:03:51 -07:00
Trevor Johns
d991bed6f1
Resolved conflicts for merge of '9875ec66' into lmp-dev
...
Conflicts:
build/sdk.atree
Change-Id: Ie195fc75425ccb4ad36e3267627ae66619380505
2014-10-15 21:16:16 -07:00
Xavier Ducrohet
25feba6980
Package libc++.so in the build-tools.
...
This is needed by llvm-rs-cc.
Bug: 17584627
Change-Id: Id0ee90ccead26d3078f3f25022391d6866152203
2014-10-01 22:12:58 -07:00
Stephen Hines
3f2caae206
Restore the ability to build RS-related binaries on Windows.
...
Bug: 14416410
This change reverts two prior commits (listed below):
Revert "Use renderscript prebuilts for windows."
This reverts commit ebacf02e88 .
Revert "Temporarily disable rs/bcc in win_sdk"
This reverts commit c63c2d31ba .
2014-09-30 02:35:08 -07:00
Naoki Ishihara
a9b5dd3bb3
Add samples to sdk.atree
...
Change-Id: I34ee63184f2dea6db253bf2ae2b671abb9ab6c4a
2014-09-19 22:17:08 -07:00
Raphael Moll
fa090e240f
SDK Addon multi-sys-img support, part 2.
...
Change the sdk_repo rule to generate a system-image zip package and its
corresponding XML for the addon.
Change-Id: I3c2318d2085362f62784415713b44cc8fe97ea9c
2014-08-21 16:00:12 -07:00
Ying Wang
e522c95f8f
Use arm64 kernel-qemu in sdk-android-arm64-v8a.atree.
...
Bug: 17105204
Change-Id: I80dcad8198926dd0b758d65bd8704eb4c6b39e8d
2014-08-18 10:46:21 -07:00
Ying Wang
06a0ec0b97
new installation path of apks.
...
To fix the SDK build.
Change-Id: I6c401e791bd59367bbd058f323db0d94bf623db5
2014-07-21 16:05:30 -07:00
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