Ying Wang
a800e3d328
Merge "Error and exit if BUILD_MULTI_PREBUILT is incorrectly used"
2013-07-31 23:54:07 +00:00
Ying Wang
a8ae7f787d
Error and exit if BUILD_MULTI_PREBUILT is incorrectly used
...
Bug: 10114476
Change-Id: Id51e7ca443c3742e17cbe114aefbb7ed3870b0e5
2013-07-31 16:26:01 -07:00
Elliott Hughes
c22bb6ecab
Remove one last icu.dat.
...
Change-Id: Iadeae68e49b18d735e7cfc263800c96998efd23b
2013-07-31 16:25:26 -07:00
Elliott Hughes
6f16857720
resolved conflicts for merge of 8714c831
to master
...
Change-Id: I58a6ab217aeaa5de099a9d79d1830c833f718a9d
2013-07-31 15:49:04 -07:00
Elliott Hughes
8714c83164
am 2266fa92: Merge "Remove the bogus icu.dat dependency."
...
* commit '2266fa92a856a81fdfc5e6c5d9b073b2d6173a02':
Remove the bogus icu.dat dependency.
2013-07-31 15:43:11 -07:00
Elliott Hughes
2266fa92a8
Merge "Remove the bogus icu.dat dependency."
2013-07-31 22:35:48 +00:00
Elliott Hughes
2092dc9dbc
Remove the bogus icu.dat dependency.
...
Simply depending on the icu4c libraries now pulls in the appropriate
data files for you.
Change-Id: Ied659584b2583c92d871c5823988ce0a865eabe4
2013-07-31 15:02:17 -07:00
Ying Wang
172f5f5746
More verbose on what the build system is doing
...
Sometimes users get confused for long time of no message printed to the
screen.
Change-Id: I99d3b2954f3dcba47d5ee5dd9fd760578c0e0192
2013-07-31 12:22:57 -07:00
Andy McFadden
5ac0ade3bc
Merge "Add screenrecord"
2013-07-31 14:29:25 +00:00
Scott Main
3c70a5caf9
am bc36e229: am d1d606b4: am c774a312: Merge "fix sidebar autoscroll when the selected doc is not visible. bug: 9676913" into jb-mr2-docs
...
* commit 'bc36e22992e11e9a3856f1c78bb73ee44a748e92':
fix sidebar autoscroll when the selected doc is not visible. bug: 9676913
2013-07-30 20:18:41 -07:00
Scott Main
e0d430d409
am 65c92265: am 14066e74: am 5eccda8d: add \'wide\' version of design/develop cross-link buttons. Primarily for training pages, which have a wider TOC box
...
* commit '65c922653bbdd779bc250befe5c78b1b78f8577c':
add 'wide' version of design/develop cross-link buttons. Primarily for training pages, which have a wider TOC box
2013-07-30 20:18:40 -07:00
Scott Main
bc36e22992
am d1d606b4: am c774a312: Merge "fix sidebar autoscroll when the selected doc is not visible. bug: 9676913" into jb-mr2-docs
...
* commit 'd1d606b4d6370ff535c1651eeec659137ad880a6':
fix sidebar autoscroll when the selected doc is not visible. bug: 9676913
2013-07-30 20:13:31 -07:00
Scott Main
65c922653b
am 14066e74: am 5eccda8d: add \'wide\' version of design/develop cross-link buttons. Primarily for training pages, which have a wider TOC box
...
* commit '14066e74c3ce41a49395ef9805d998ceeb52d41a':
add 'wide' version of design/develop cross-link buttons. Primarily for training pages, which have a wider TOC box
2013-07-30 20:13:30 -07:00
Scott Main
d1d606b4d6
am c774a312: Merge "fix sidebar autoscroll when the selected doc is not visible. bug: 9676913" into jb-mr2-docs
...
* commit 'c774a312359ddf3fedcbe90b00ff6d6f330d95b8':
fix sidebar autoscroll when the selected doc is not visible. bug: 9676913
2013-07-30 20:09:21 -07:00
Scott Main
14066e74c3
am 5eccda8d: add \'wide\' version of design/develop cross-link buttons. Primarily for training pages, which have a wider TOC box
...
* commit '5eccda8d6b929d607ae73485d5e86576184d057f':
add 'wide' version of design/develop cross-link buttons. Primarily for training pages, which have a wider TOC box
2013-07-30 20:09:21 -07:00
Scott Main
c774a31235
Merge "fix sidebar autoscroll when the selected doc is not visible. bug: 9676913" into jb-mr2-docs
2013-07-31 01:14:34 +00:00
Scott Main
bc72957e92
fix sidebar autoscroll when the selected doc is not visible.
...
bug: 9676913
This was not working for third generation list items. Switching
the position measurement to be relative to the entire page rather than
the parent container fixes it. I then added 125px to account for
the site header and set the threshold and placement of scrolled items
to be at 80% the nav height.
Change-Id: Idda1896d11069e56325ba830ed745dae9e0fc483
2013-07-30 18:00:51 -07:00
Andy McFadden
64761bcdd5
Add screenrecord
...
Add the "screenrecord" command for all builds of most devices.
Change-Id: Ib4f37cc219a8d2f9a09ac3f457e5f94506a4d88d
2013-07-30 17:22:00 -07:00
Scott Main
5eccda8d6b
add 'wide' version of design/develop cross-link buttons.
...
Primarily for training pages, which have a wider TOC box
Change-Id: I29644596e72e43432f7bd00fd6a5aabf7e3a6bb7
2013-07-30 14:56:45 -07:00
Joe Fernandez
a8bfc66c96
am f4f3db60: (-s ours) am 847e02cb: am 3c1da3e2: (-s ours) DO NOT MERGE cherrypick from jb-mr2-ub-dev docs: small fix for NDK download table
...
* commit 'f4f3db604fd560e4bcecbdf753ec6f8c9feb8a1a':
DO NOT MERGE cherrypick from jb-mr2-ub-dev docs: small fix for NDK download table
2013-07-30 14:56:25 -07:00
Joe Fernandez
f4f3db604f
am 847e02cb: am 3c1da3e2: (-s ours) DO NOT MERGE cherrypick from jb-mr2-ub-dev docs: small fix for NDK download table
...
* commit '847e02cbbbe7ecba0b560acc7d5b139798f67ab7':
DO NOT MERGE cherrypick from jb-mr2-ub-dev docs: small fix for NDK download table
2013-07-30 14:53:07 -07:00
Joe Fernandez
847e02cbbb
am 3c1da3e2: (-s ours) DO NOT MERGE cherrypick from jb-mr2-ub-dev docs: small fix for NDK download table
...
* commit '3c1da3e2c966a607bf74bda5151013c5ac324f80':
DO NOT MERGE cherrypick from jb-mr2-ub-dev docs: small fix for NDK download table
2013-07-30 14:41:58 -07:00
Jean-Baptiste Queru
8a7cd65585
am 50a402af: am f1534b62: Merge "Added generic hook for loading vendor specific defintions"
...
* commit '50a402af7ae550c96b9142ab56d3a23a8a8d22b1':
Added generic hook for loading vendor specific defintions
2013-07-30 10:28:17 -07:00
Jean-Baptiste Queru
50a402af7a
am f1534b62: Merge "Added generic hook for loading vendor specific defintions"
...
* commit 'f1534b6292a609bb5f55c4a617f3cd1054f90a81':
Added generic hook for loading vendor specific defintions
2013-07-30 07:33:53 -07:00
Jean-Baptiste Queru
f1534b6292
Merge "Added generic hook for loading vendor specific defintions"
2013-07-30 14:26:45 +00:00
Todd Poynor
2b3bd4a88b
Add healthd
...
Change-Id: I055581a12fe88a4e1fb04e675036bf0d345c05c6
2013-07-26 21:32:38 +00:00
Ying Wang
54d9cc3fac
am cd9cadbc: am 7768c91c: am 94de1eba: Put a copy of the radio/bootloader files in the dist dir.
...
* commit 'cd9cadbcf68bfe07ac994e61aa00969572ae3fd5':
Put a copy of the radio/bootloader files in the dist dir.
2013-07-26 13:00:20 -07:00
Ying Wang
cd9cadbcf6
am 7768c91c: am 94de1eba: Put a copy of the radio/bootloader files in the dist dir.
...
* commit '7768c91c1c90e7c13390396d895a3afd5fda3e0f':
Put a copy of the radio/bootloader files in the dist dir.
2013-07-26 12:57:19 -07:00
Ying Wang
7768c91c1c
am 94de1eba: Put a copy of the radio/bootloader files in the dist dir.
...
* commit '94de1eba0e87297421789b339c5f26bf3e48eeb1':
Put a copy of the radio/bootloader files in the dist dir.
2013-07-26 12:54:11 -07:00
Ying Wang
94de1eba0e
Put a copy of the radio/bootloader files in the dist dir.
...
Bug: 10035750
Change-Id: I3b51e61ec737899d9264885a1e66c89a7a740d54
2013-07-26 12:19:20 -07:00
Marie Lennerhagen
9e5efceff9
Added generic hook for loading vendor specific defintions
...
Change-Id: I6dec9c378ed0aabf9e60f8dcb05c6043bbcc30e5
2013-07-26 18:12:36 +00:00
Jonathan Dixon
8c0d17b6e1
Merge "Remove WEBCORE_INSTRUMENTATION and ENABLE_SVG"
2013-07-26 16:49:19 +00:00
keunyoung
50b9c94777
Merge "fix build"
2013-07-26 01:42:03 +00:00
keunyoung
a219bdc0ba
fix build
...
- PDK_FUSION_OUT_DIR was null inside macro, lead into missing copy
bug: 10023069
Change-Id: I323d2fb6a2e955f9a7c27559701a7af36a89fea8
2013-07-25 18:22:43 -07:00
Joe Fernandez
3c1da3e2c9
DO NOT MERGE
...
cherrypick from jb-mr2-ub-dev
docs: small fix for NDK download table
Change-Id: Ib014e0310960cf10566a6d04aee2acb81346a20c
2013-07-25 18:21:00 -07:00
Joe Fernandez
1c1eebcbd5
am cb4a1e67: am 8d936902: docs: small fix for NDK download table
...
* commit 'cb4a1e673eafc52c496dfed294c5431c80c52688':
docs: small fix for NDK download table
2013-07-25 17:23:04 -07:00
Joe Fernandez
cb4a1e673e
am 8d936902: docs: small fix for NDK download table
...
* commit '8d9369023962fefc0b598283b6850789b26f5249':
docs: small fix for NDK download table
2013-07-25 17:21:19 -07:00
Joe Fernandez
8d93690239
docs: small fix for NDK download table
...
Change-Id: Ib014e0310960cf10566a6d04aee2acb81346a20c
2013-07-25 17:05:06 -07:00
Dirk Dougherty
45924686eb
am 8574e7d9: am 48e3f1d6: Add new table rows for legacy ndk downloads.
...
* commit '8574e7d93e28069983da51ef40fa47bdc2e51daa':
Add new table rows for legacy ndk downloads.
2013-07-25 17:04:24 -07:00
Ying Wang
5efaa72ac1
am 51aab877: am 5d1db8b4: Merge "Allow proto builds to pass in java proto params."
...
* commit '51aab8775ab86990abef411d00f5686e41022eee':
Allow proto builds to pass in java proto params.
2013-07-25 17:04:20 -07:00
Ulas Kirazci
c7fda981ef
am fcbc0b7f: am 5094e33b: Merge "Revert "Allow proto builds to pass in java proto params.""
...
* commit 'fcbc0b7f0b8f654414c97699b36e6356cbb4bb08':
Revert "Allow proto builds to pass in java proto params."
2013-07-25 16:34:23 -07:00
Dirk Dougherty
8574e7d93e
am 48e3f1d6: Add new table rows for legacy ndk downloads.
...
* commit '48e3f1d6e40581bc4379c180b9de6fdd41026eee':
Add new table rows for legacy ndk downloads.
2013-07-25 16:12:55 -07:00
Dirk Dougherty
48e3f1d6e4
Add new table rows for legacy ndk downloads.
...
Change-Id: If8ebc459415a22719d351d87a55ddeb4ddb6b3ba
2013-07-25 15:54:26 -07:00
Jonathan Dixon
d588792d29
Remove WEBCORE_INSTRUMENTATION and ENABLE_SVG
...
WEBCORE_INSTRUMENTATION is never set in practice, nor ever read, so seems
totally spurious.
ENABLE_SVG is the default since 3.0 and disabling will no longer be a
supported option in chromium webview.
Change-Id: I651fa55fd7c20b2f251bae584407548be174a8aa
2013-07-25 15:52:17 -07:00
Ying Wang
51aab8775a
am 5d1db8b4: Merge "Allow proto builds to pass in java proto params."
...
* commit '5d1db8b4335d554bfd7e028496f0305b78b0676b':
Allow proto builds to pass in java proto params.
2013-07-25 15:36:07 -07:00
Ying Wang
5d1db8b433
Merge "Allow proto builds to pass in java proto params."
2013-07-25 22:32:08 +00:00
Ying Wang
7661c1d6f1
Merge "Add PRODUCT_BOOT_JARS to derive BOOTCLASSPATH"
2013-07-25 22:09:32 +00:00
Ulas Kirazci
6e485b545a
Allow proto builds to pass in java proto params.
...
Change-Id: I65fe0cd96f818f59267da6159e6bd2ad28f07a11
2013-07-25 13:40:53 -07:00
Ulas Kirazci
fcbc0b7f0b
am 5094e33b: Merge "Revert "Allow proto builds to pass in java proto params.""
...
* commit '5094e33bddc5bb7ba8c63b725078764450b16973':
Revert "Allow proto builds to pass in java proto params."
2013-07-25 13:35:27 -07:00
Ulas Kirazci
5094e33bdd
Merge "Revert "Allow proto builds to pass in java proto params.""
2013-07-25 20:31:48 +00:00