Commit Graph

780 Commits

Author SHA1 Message Date
Trevor Johns
e140f8ddce am c3c6324e: am f78c6348: am f83bd1f8: am 41478596: am c6b0eb1a: Merge "Revert "sdk.atree: Disable Wear samples for lmp branches"" into lmp-docs
* commit 'c3c6324ebeaa17a0975f5acf9f129382808086d5':
  Revert "sdk.atree: Disable Wear samples for lmp branches"
2014-11-13 21:14:55 +00:00
Trevor Johns
f78c6348f7 am f83bd1f8: am 41478596: am c6b0eb1a: Merge "Revert "sdk.atree: Disable Wear samples for lmp branches"" into lmp-docs
* commit 'f83bd1f88165b73f122a769c4366083f84ff9e28':
  Revert "sdk.atree: Disable Wear samples for lmp branches"
2014-11-13 20:57:51 +00:00
Trevor Johns
41478596ae am c6b0eb1a: Merge "Revert "sdk.atree: Disable Wear samples for lmp branches"" into lmp-docs
* commit 'c6b0eb1ac163fb65c17b397600079748c4d3901b':
  Revert "sdk.atree: Disable Wear samples for lmp branches"
2014-11-13 03:31:29 +00:00
Trevor Johns
c6b0eb1ac1 Merge "Revert "sdk.atree: Disable Wear samples for lmp branches"" into lmp-docs 2014-11-13 02:41:56 +00:00
Trevor Johns
b124012eac Revert "sdk.atree: Disable Wear samples for lmp branches"
This reverts commit fcd28181a1.

Change-Id: I9e76020676b194917f98c5f8c4ce8c6d6fe6cf5e
2014-11-13 02:41:48 +00:00
Trevor Johns
400208abf8 am 716f9ff5: am 0161ae54: am 705cf850: am 13ce376e: am dff4d5d4: Merge "Add two new samples." into lmp-docs
* commit '716f9ff5a9b69b85ec9a92f63e10d8177acb7185':
  Add two new samples.
2014-11-12 23:49:56 +00:00
Trevor Johns
0161ae549a am 705cf850: am 13ce376e: am dff4d5d4: Merge "Add two new samples." into lmp-docs
* commit '705cf8509d651773275e293c941bf7046074ec87':
  Add two new samples.
2014-11-12 19:39:28 +00:00
Trevor Johns
13ce376eea am dff4d5d4: Merge "Add two new samples." into lmp-docs
* commit 'dff4d5d4fd5d06ed281467bff606b51c1afa380b':
  Add two new samples.
2014-11-12 19:30:28 +00:00
Trevor Johns
dff4d5d4fd Merge "Add two new samples." into lmp-docs 2014-11-12 19:26:50 +00:00
Renato Mangini
876d208329 Add two new samples.
Added MessagingServices and MediaBrowserService to sdk build.

Bug: 18323953
Change-Id: I6b2d4caae38a42ec2a6673a5b6c02c7f5a21b868
2014-11-12 11:21:30 -08:00
Trevor Johns
dfc8899c9e am a25be96a: am 8488cdb6: am 5d84789a: am 062a2d1c: am fcd28181: sdk.atree: Disable Wear samples for lmp branches
* commit 'a25be96a521c9d01c031bdad084ead867bfb140c':
  sdk.atree: Disable Wear samples for lmp branches
2014-11-12 14:36:44 +00:00
Trevor Johns
8488cdb664 am 5d84789a: am 062a2d1c: am fcd28181: sdk.atree: Disable Wear samples for lmp branches
* commit '5d84789a68a96237efad9e911dfd97c8d4a85103':
  sdk.atree: Disable Wear samples for lmp branches
2014-11-12 14:26:09 +00:00
Trevor Johns
062a2d1cb9 am fcd28181: sdk.atree: Disable Wear samples for lmp branches
* commit 'fcd28181a15ebe95724fe096a8b5198c964b0d7f':
  sdk.atree: Disable Wear samples for lmp branches
2014-11-12 05:03:28 +00:00
Adam Lesinski
5e44c8833f am 94527b09: am ed6aaf3f: Merge "Add split-select tool to SDK build." into lmp-mr1-dev
* commit '94527b094fbcbf73ce00ecfcdc2ee31aa74ccd1e':
  Add split-select tool to SDK build.
2014-11-11 01:06:01 +00:00
Trevor Johns
fcd28181a1 sdk.atree: Disable Wear samples for lmp branches
Wear samples are currently generated for the klp-modular branch only.

Change-Id: I127a75d171a31f334c5006b6ce251ff1d4f35f42
2014-11-06 21:11:46 +00:00
Adam Lesinski
d155da9790 Add split-select tool to SDK build.
Change-Id: I3889cb62587cdd8479cd91cee2412703f90cd91c
2014-11-05 11:34:03 -08:00
Xavier Ducrohet
2dcf807247 am d150e285: am 4aceb725: am 754cfeb6: am 8641d4da: Move mulit-dex files around.
* commit 'd150e285b5097fea8c5e2e7015e723437daf7f9d':
  Move mulit-dex files around.
2014-11-01 17:48:19 +00:00
Xavier Ducrohet
4aceb7250d am 754cfeb6: am 8641d4da: Move mulit-dex files around.
* commit '754cfeb6f7baf2e5499959ac439a8a95400a9974':
  Move mulit-dex files around.
2014-11-01 14:09:55 +00:00
Xavier Ducrohet
8641d4dada Move mulit-dex files around.
This allows the mainDexClasses to work by
finding shrinkedAndroid.jar and proguard (from
the SDK Tools folder) correctly.

Change-Id: Ib3d85f775876b8a487af04bd072f6d8877f31d3b
2014-10-31 13:47:47 -07:00
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