Chris Banes
64d5a34e12
am c5522cae: Merge "Revert "Disable the design support library and demos"" into lmp-mr1-ub-dev
...
* commit 'c5522cae8872dd761c4fe0289b63500328717e12':
Revert "Disable the design support library and demos"
2015-04-09 07:27:58 +00:00
Chris Banes
f9cd4395a2
am 5fdbf918: Merge "Revert "Disable design lib in master build file"" into lmp-mr1-ub-dev
...
* commit '5fdbf91821442faab51330f69d5a3c20bf4793bb':
Revert "Disable design lib in master build file"
2015-04-09 07:27:55 +00:00
Chris Banes
b859e355e5
Revert "Disable the design support library and demos"
...
This reverts commit 97930fc88b
2015-04-09 07:17:57 +00:00
Chris Banes
5fdbf91821
Merge "Revert "Disable design lib in master build file"" into lmp-mr1-ub-dev
2015-04-09 07:17:13 +00:00
Chris Banes
d1723b40dd
Revert "Disable design lib in master build file"
...
This reverts commit 988f263d5a
2015-04-09 07:16:59 +00:00
Chris Banes
3911fb90ed
am 4f10c76a: Merge "Disable design lib in master build file" into lmp-mr1-ub-dev
...
* commit '4f10c76afced740a62b1e60a62be0314db5f02fb':
Disable design lib in master build file
2015-04-08 11:31:29 +00:00
Chris Banes
4f10c76afc
Merge "Disable design lib in master build file" into lmp-mr1-ub-dev
2015-04-08 11:24:35 +00:00
Chris Banes
a8460253ae
am 97930fc8: Disable the design support library and demos
...
* commit '97930fc88bed4240b23fdca24b7817cad888367a':
Disable the design support library and demos
2015-04-08 09:25:12 +00:00
Chris Banes
988f263d5a
Disable design lib in master build file
...
Change-Id: I60a42f56b62fa68987e277ce5045d3d672dcf441
2015-04-08 10:18:59 +01:00
Chris Banes
97930fc88b
Disable the design support library and demos
...
Change-Id: Ia0247179d3230d0ec2a198d458bc417fe3102d9d
2015-04-08 08:11:06 +01:00
Chris Craik
625dde7bdf
am 630b075c: Merge "Fix build - support new systrace file structure"
...
* commit '630b075cdb4299e72d26d8cb355a28c342479201':
Fix build - support new systrace file structure
2015-04-01 20:09:59 +00:00
Chris Craik
6941c574cf
Fix build - support new systrace file structure
...
Change-Id: Ifcd97179b9d724ad8df6e623b492517d509d82dc
2015-03-30 18:07:32 -07:00
Trevor Johns
edcf97efa7
am b2c35d15: am 2298d3b4: am 0d473ea1: am 721cd1b8: am 77b5d394: Update sdk.atree and samples/browseable for lastest samples release
...
* commit 'b2c35d1597aace199282148142249a3b14bd95f3':
Update sdk.atree and samples/browseable for lastest samples release
2015-03-31 00:12:46 +00:00
Trevor Johns
2298d3b48d
am 0d473ea1: am 721cd1b8: am 77b5d394: Update sdk.atree and samples/browseable for lastest samples release
...
* commit '0d473ea178b5120ae45249c4d644cd00e876e63e':
Update sdk.atree and samples/browseable for lastest samples release
2015-03-31 00:00:49 +00:00
Trevor Johns
721cd1b86a
am 77b5d394: Update sdk.atree and samples/browseable for lastest samples release
...
* commit '77b5d394ff91872896c69f5cee93a126f3aed92e':
Update sdk.atree and samples/browseable for lastest samples release
2015-03-30 23:47:14 +00:00
Trevor Johns
77b5d394ff
Update sdk.atree and samples/browseable for lastest samples release
...
Synced to developers/samples/android commit
97b2cfe5ba6d8fa8daaf3273141b321b5fe9e910.
Change-Id: I360cfa147e71dd519b841df41b4e878f86b9b27b
2015-03-30 16:06:43 -07:00
Dan Albert
99ad31c686
am e1915bdd: am 3ba45f78: am 2474617f: Merge "Allow libbase to be used on Windows."
...
* commit 'e1915bdd6302e4ea6abe363d04ad8eba9bbf3df8':
Allow libbase to be used on Windows.
2015-03-30 18:50:29 +00:00
Dan Albert
3ba45f7871
am 2474617f: Merge "Allow libbase to be used on Windows."
...
* commit '2474617f0162c7de1c359321071706540983cd2d':
Allow libbase to be used on Windows.
2015-03-30 18:36:33 +00:00
Dan Albert
2474617f01
Merge "Allow libbase to be used on Windows."
2015-03-30 17:47:20 +00:00
Narayan Kamath
d95f8c708c
am d3b57a16: am 8a9dd8d1: am 05bbd6dd: Merge "Remove reference to libzipfile."
...
* commit 'd3b57a16b2330fcf29eeb7b00ad189da01dddb54':
Remove reference to libzipfile.
2015-03-24 01:31:40 +00:00
Narayan Kamath
8a9dd8d124
am 05bbd6dd: Merge "Remove reference to libzipfile."
...
* commit '05bbd6dd357e242ec09d169d219b0b018d258f72':
Remove reference to libzipfile.
2015-03-23 10:10:43 +00:00
Narayan Kamath
08857b6268
Remove reference to libzipfile.
...
This target has been deleted.
Change-Id: I0a79c41eda1b325d3e61066dd6842812c5d1d582
2015-03-20 09:35:30 +00:00
Dan Albert
23c2bb52b3
Allow libbase to be used on Windows.
...
Change-Id: I9182f42393438d722f4ad33548c262d8405c1cba
2015-03-19 22:40:12 -07:00
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
