Commit Graph

821 Commits

Author SHA1 Message Date
Dan Albert
a489ea0141 am 73b3f5cd: am 80dd2ac9: Merge "Fix SDK library paths for Windows and Darwin too."
* commit '73b3f5cde4bfdebbe4893f0234d1b0a9ddd09640':
  Fix SDK library paths for Windows and Darwin too.
2015-03-14 04:08:35 +00:00
Dan Albert
73b3f5cde4 am 80dd2ac9: Merge "Fix SDK library paths for Windows and Darwin too."
* commit '80dd2ac93d4e89c419eb9c57ddf3178212180564':
  Fix SDK library paths for Windows and Darwin too.
2015-03-14 03:12:43 +00:00
Dan Albert
d4a1f0619b Fix SDK library paths for Windows and Darwin too.
Change-Id: Ibaae6fd4089c804f50f8065e614c5de1b71c242b
2015-03-14 02:34:38 +00:00
Dan Albert
89f9ff8893 am e0f3196e: am 170b153b: Merge "Fix library paths for SDK tools."
* commit 'e0f3196e3a65d06874c21639ae4d5db7d82f0f78':
  Fix library paths for SDK tools.
2015-03-14 00:17:27 +00:00
Dan Albert
e0f3196e3a am 170b153b: Merge "Fix library paths for SDK tools."
* commit '170b153b3e3b087f77d806323a685ca0b4597561':
  Fix library paths for SDK tools.
2015-03-14 00:13:10 +00:00
Dan Albert
b7125622c8 Fix library paths for SDK tools.
The rpath for the binaries is ../lib but the libraries were being
installed to the same directory as the executables.

Bug: 19617220
Change-Id: I5c4158698b6703843b67543d4396e2bffc5fb313
2015-03-13 16:30:21 -07:00
Chris Craik
1447a4987b Fix build - support new systrace file structure
Change-Id: Ifcd97179b9d724ad8df6e623b492517d509d82dc
2015-03-06 15:01:06 -08:00
Chris Banes
2068c6a59a Remove the old ActionBarCompat sample
Change-Id: I04dfe8dd38e153ae8f28c3044a7e6d37f1a7d562
2015-02-27 10:01:47 +00:00
Chris Banes
2d44f66649 am abdd0b39: am c841e38f: am 9ad1e854: Update sdk.atree for new Palette dir structure
* commit 'abdd0b39b75e440e70f144b3d2f4405cccefd372':
  Update sdk.atree for new Palette dir structure
2015-02-24 14:51:54 +00:00
Chris Banes
abdd0b39b7 am c841e38f: am 9ad1e854: Update sdk.atree for new Palette dir structure
* commit 'c841e38f88db355c93c8e7372b15de3ae3d05715':
  Update sdk.atree for new Palette dir structure
2015-02-24 14:46:34 +00:00
Chris Banes
9ad1e85466 Update sdk.atree for new Palette dir structure
Change-Id: I7776f4d843aac8496240a54d0982525039b91469
2015-02-22 14:36:20 +00:00
Ying Wang
c1c9431a36 am 2d0ce7b8: am 214797ac: Merge "Update the winsdk-tools prerequisites."
* commit '2d0ce7b832d1c6e76a53ba6475858181a7beac95':
  Update the winsdk-tools prerequisites.
2015-01-28 00:42:19 +00:00
Chris Banes
ef0f60ea9a am 40ef0a61: am 219e5f1c: Merge "Add design support lib to sdk.atree" into lmp-mr1-ub-dev
* commit '40ef0a61b140b3933e97b06fd7ab136277376814':
  Add design support lib to sdk.atree
2015-01-27 23:32:50 +00:00
Ying Wang
2d0ce7b832 am 214797ac: Merge "Update the winsdk-tools prerequisites."
* commit '214797acbe66390a012d2ba47200f6e8330d5c33':
  Update the winsdk-tools prerequisites.
2015-01-27 22:12:38 +00:00
Ying Wang
b6549fd3fc Update the winsdk-tools prerequisites.
To build the windows SDK tools, we need only the Linux llvm-tblgen and
clang-tblgen, but not llvm-rs-cc or bcc_compat.
This reduces significantly build time if you want run only "make
winsdk-tools".

Bug: 19149444
Change-Id: I971dd6a6e1a7dd11a968ee8be8cd02085055c262
2015-01-27 12:43:53 -08:00
Chris Banes
40ef0a61b1 am 219e5f1c: Merge "Add design support lib to sdk.atree" into lmp-mr1-ub-dev
* commit '219e5f1c489b8664447abf567fdb04efcc0826fc':
  Add design support lib to sdk.atree
2015-01-27 14:33:54 +00:00
Chris Banes
35bdfca5ad Add design support lib to sdk.atree
Change-Id: I0ca9f2d4ec64b8d455cec1fe10c4351497bf263a
2015-01-26 13:27:07 +00:00
Trevor Johns
c80d9e6c60 am a6aa0a4a: am 659e1ca0: am 23e2194c: am 2f3095d9: am cee6440c: am babfe028: Add new samples to sdk.atree
* commit 'a6aa0a4aedbc2724b424e5644345b3baba0cfc7e':
  Add new samples to sdk.atree
2014-12-16 11:03:16 +00:00
Trevor Johns
a6aa0a4aed am 659e1ca0: am 23e2194c: am 2f3095d9: am cee6440c: am babfe028: Add new samples to sdk.atree
* commit '659e1ca0c74d25df65aa761ce705273de33e0cc3':
  Add new samples to sdk.atree
2014-12-16 04:01:44 +00:00
Trevor Johns
23e2194cf9 am 2f3095d9: am cee6440c: am babfe028: Add new samples to sdk.atree
* commit '2f3095d93b5ef30d89ab3d939676f03918d76227':
  Add new samples to sdk.atree
2014-12-16 03:41:50 +00:00
Trevor Johns
cee6440c2a am babfe028: Add new samples to sdk.atree
* commit 'babfe02866d84a457381a7d4c895596c8ec75165':
  Add new samples to sdk.atree
2014-12-12 21:32:14 +00:00
Trevor Johns
babfe02866 Add new samples to sdk.atree
- PermissionRequest
- DirectorySelection
- AppUsageStatistics
- ScreenCapture

Change-Id: I78d70f47dab54bc40a0e4e320ce6f8799b2cc785
2014-12-11 15:12:05 -08:00
Yohann Roussel
491a3adb8d Add jack.jar dependency when using transform-jar-to-jack
(cherry picked from commit 7324414107678ab1bcc3ed94b3c92aa36686d71d)

Change-Id: I7b3aadc1e12c31d5e88dc0c38e95e367103bc55f
2014-12-10 10:10:12 +01:00
Yohann Roussel
c5ed3d9628 Merge "Declare target to allow compilation to Jack files." 2014-12-05 09:21:34 +00:00
Deepanshu Gupta
e4067e0dad am 0407e185: am 9247e323: am 154cfd7a: am 7dd11bd0: am ca15c415: Merge "Add tzdata to SDK build" into lmp-dev
* commit '0407e185d7ff7e46f735f9be739096daaf3625d3':
  Add tzdata to SDK build
2014-12-04 20:45:52 +00:00
Deepanshu Gupta
0407e185d7 am 9247e323: am 154cfd7a: am 7dd11bd0: am ca15c415: Merge "Add tzdata to SDK build" into lmp-dev
* commit '9247e32376b0f1d715f176317d15e9c1f1fdc34a':
  Add tzdata to SDK build
2014-12-04 20:25:39 +00:00
Deepanshu Gupta
154cfd7a55 am 7dd11bd0: am ca15c415: Merge "Add tzdata to SDK build" into lmp-dev
* commit '7dd11bd0664f7e43c049eba632e390451ddeb64d':
  Add tzdata to SDK build
2014-12-04 02:56:53 +00:00
Deepanshu Gupta
ca15c41532 Merge "Add tzdata to SDK build" into lmp-dev 2014-12-03 20:48:30 +00:00
Trevor Johns
56e258d2eb am 0b1eeb9e: am 9445329c: am 6276d0ac: am d9911fa7: am cdf2a929: am 82ea8a02: Add WatchFace sample to sdk.atree
* commit '0b1eeb9e81d5133b63082b5464daf0747532dddb':
  Add WatchFace sample to sdk.atree
2014-11-21 23:13:53 +00:00
Trevor Johns
0b1eeb9e81 am 9445329c: am 6276d0ac: am d9911fa7: am cdf2a929: am 82ea8a02: Add WatchFace sample to sdk.atree
* commit '9445329cd92b16a48c25ffce870021fdeaa0560a':
  Add WatchFace sample to sdk.atree
2014-11-21 22:03:57 +00:00
Trevor Johns
6276d0ac33 am d9911fa7: am cdf2a929: am 82ea8a02: Add WatchFace sample to sdk.atree
* commit 'd9911fa7af9f185e39a9e2d8fb4882a65903d9e5':
  Add WatchFace sample to sdk.atree
2014-11-21 21:53:01 +00:00
Deepanshu Gupta
a16c2df188 Add tzdata to SDK build
Bundle tzdata with SDK, needed by LayoutLib.

Bug: http://b.android.com/79160
Change-Id: Ibdd13ee4dddaf4881aee9f0d5de8e6bccf7c512d
2014-11-21 01:44:50 +00:00
Trevor Johns
82ea8a020f Add WatchFace sample to sdk.atree
Change-Id: I24a3e34674a02c0909f5cea60ea9465f4f3395f2
2014-11-20 16:33:27 -08:00
Trevor Johns
07382d5107 am e140f8dd: am c3c6324e: am f78c6348: am f83bd1f8: am 41478596: am c6b0eb1a: Merge "Revert "sdk.atree: Disable Wear samples for lmp branches"" into lmp-docs
* commit 'e140f8ddce04e4313e7d12d94ae781ab90e17947':
  Revert "sdk.atree: Disable Wear samples for lmp branches"
2014-11-14 18:57:02 +00:00
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
Yohann Roussel
83efd5e421 Declare target to allow compilation to Jack files.
(cherry picked from commit d45df2b75a37813ff03ae79a62c76f9dca7a0003)

Change-Id: I091ef988aa395ff9cf28dbbe4c1834f6c1ba183b
2014-11-12 16:54:44 +01: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