Xavier Ducrohet
bf541eb510
am f75191cb: am 0d574614: am 25907e2a: am 8361bb0d: Update build-tools and support for multidex.
...
* commit 'f75191cb3e61886f6666ec238c983263b75be91e':
Update build-tools and support for multidex.
2014-10-31 00:12:52 +00:00
Xavier Ducrohet
a008a5698a
am 2c799e08: am e67c313e: am 9ccbed21: am 86d28ad8: Add jack/jill/multidex lib to build-tools.
...
* commit '2c799e0856e4bd9b7ec5071f08fdf074750d05cc':
Add jack/jill/multidex lib to build-tools.
2014-10-31 00:12:47 +00:00
Xavier Ducrohet
0d574614cf
am 25907e2a: am 8361bb0d: Update build-tools and support for multidex.
...
* commit '25907e2a994aacf2d45743f23bb8adc54a3d2d44':
Update build-tools and support for multidex.
2014-10-29 18:52:23 +00:00
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
8361bb0dfa
Update build-tools and support for multidex.
...
Add the script to run multi-dex manually in build tools
Update non-maven support package to .0.1 to release a version
with the fixed multi-dex support lib.
Change-Id: I78c84e0d999855f9fc20fadfa21647e570a9f8c9
2014-10-29 11:07:40 -07:00
Adam Lesinski
291e86fb92
am 23dfdd09: am 56fd4241: Merge "Enable building gtest for Windows" into lmp-mr1-dev
...
* commit '23dfdd098448e193d63b0dcc4e5ba00b51ca2cff':
Enable building gtest for Windows
2014-10-29 00:17:32 +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
cd7097298d
am 35828e85: am db9b560e: am d74a44da: am de3f94a0: 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/56460
...
* commit '35828e85bbb1a58d4dde4caef35d506b8ecde1b1':
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 )
2014-10-22 21:47:10 +00:00
Joe Fernandez
773435f9f0
am e054c2b3: am 705a1bb4: am d42d6553: am c789ef84: Merge "sdk.atree: Move JobScheduler sample from \'ui/views\' to \'background\'" into lmp-dev
...
* commit 'e054c2b35ffcfe643107d65073b6615fde7af828':
sdk.atree: Move JobScheduler sample from 'ui/views' to 'background'
2014-10-22 21:46:58 +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
4b16c84fb0
am c60b2dd6: am 36274ac5: Add additional samples for L to sdk.atree
...
* commit 'c60b2dd6b5982029b7115da777a1e1eefb2bab53':
Add additional samples for L to sdk.atree
2014-10-17 20:28:51 +00: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
84f0d412b6
am 4e09738a: am 66b6f721: Merge "Update sdk.atree and samples_source.prop_template for L SDK release" into lmp-dev
...
* commit '4e09738a8684cf2ba5ed111764d7804ada2a4298':
Update sdk.atree and samples_source.prop_template for L SDK release
2014-10-17 19:17:17 +00:00
Trevor Johns
339006dcbd
am 72687bd8: am ca8bc22a: sdk.atree: Fix typo and remove legacy BluetoothChat sample
...
* commit '72687bd8a7d3629b2ceb3a9fa1cefcd4bbdf4d66':
sdk.atree: Fix typo and remove legacy BluetoothChat sample
2014-10-17 19:17:11 +00: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
8dd5fc0f14
am 70c55867: am d991bed6: Resolved conflicts for merge of \'9875ec66\' into lmp-dev
...
* commit '70c55867bc6f30301a660331bbd28948a9ded734':
Add samples to sdk.atree
2014-10-16 19:16:43 +00: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
d36c4dd646
am 21af667f: am 3c0cd8cf: Merge "Package libc++.so in the build-tools." into lmp-dev
...
* commit '21af667faeba1e626e79eb823ea604652dc17cf2':
Package libc++.so in the build-tools.
2014-10-03 21:47:46 +00:00
Narayan Kamath
d515d6c5c4
resolved conflicts for merge of 3f2caae2 to lmp-mr1-dev-plus-aosp
...
Change-Id: If9f3110e57131f13c55a87169dbdc2cd8cf74660
2014-10-02 14:35:25 +01: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
a5739c851c
am 130967f3: Merge "SDK Addon multi-sys-img support, part 2." into lmp-dev
...
* commit '130967f3d3f34fc656dc43e43087d0a0c3ae5439':
SDK Addon multi-sys-img support, part 2.
2014-09-12 05:43:02 +00:00
Leandro Gracia Gil
0d6c5e8ec6
am c32e9081: am 4123e088: Merge "Add the protobuf compiler binary to the Windows SDK build."
...
* commit 'c32e90813965eab51f1494cfabb9d3457c938d85':
Add the protobuf compiler binary to the Windows SDK build.
2014-08-26 19:19:37 +00:00
Leandro Gracia Gil
4123e0886b
Merge "Add the protobuf compiler binary to the Windows SDK build."
2014-08-26 18:53:23 +00: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
00b44e517b
Use arm64 kernel-qemu in sdk-android-arm64-v8a.atree.
...
Bug: 17105204
Change-Id: I80dcad8198926dd0b758d65bd8704eb4c6b39e8d
2014-08-19 09:33:45 -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
Leandro Gracia Gil
653fe8eb04
Add the protobuf compiler binary to the Windows SDK build.
...
Change-Id: I0acca9fc39b8b5528a1ca4bf25b0bacb32b515e2
2014-07-28 15:25:41 -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
Maurice Chu
6fee567b2f
Move multidex support library
...
Multidex is being moved from frameworks/support/multidex to
frameworks/multidex.
Bug: 10674263
(cherry picked from commit 7b433ee4e4 )
Change-Id: If33387af7b58da2f258eba1240a911483daa9c7e
2014-07-18 10:52:54 +00: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
Yohann Roussel
b16fd5a5f4
Add res folder to multidex SDK projects.
...
This will fix an error when importing thoses projects with ADT.
(cherry picked from commit 6fa1156b3b )
Change-Id: Ibcd570a3f4f3bd6c8c4fd263d2d18e2cec18b787
2014-07-17 16:44:30 +02:00
Yohann Roussel
96dc8db6e5
android-support-multidex-instrumentation in SDK.
...
(cherry picked from commit 6f57b24889 )
Change-Id: Ic8e609c0025d86c873161b28d99bb0da2b6c2d27
2014-07-17 16:44:30 +02:00
Yohann Roussel
ef0e4f5a3b
Add multidex ADT project to SDK.
...
(cherry picked from commit a6ca3cf29f )
Change-Id: I44cf397dbc5649d9d701e2f8524a322d74c2aaa6
2014-07-17 16:44:30 +02:00
Yohann Roussel
604bf1f185
Include android-support-multidex in SDK libs.
...
(cherry picked from commit 9e27887b60 )
Change-Id: Ieb2901a633a687927a0c5a5db6d17896c3b86449
2014-07-17 16:44:30 +02: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