OSDN Git Service
The Android Automerger [Tue, 13 Aug 2013 20:25:24 +0000 (13:25 -0700)]
"KRS44B"
The Android Automerger [Tue, 13 Aug 2013 13:07:27 +0000 (06:07 -0700)]
"KRS44"
The Android Automerger [Tue, 13 Aug 2013 13:00:55 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Mon, 12 Aug 2013 19:31:31 +0000 (12:31 -0700)]
"KRS43B"
The Android Automerger [Mon, 12 Aug 2013 13:06:00 +0000 (06:06 -0700)]
"KRS43"
The Android Automerger [Mon, 12 Aug 2013 13:00:44 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Sat, 10 Aug 2013 19:08:48 +0000 (12:08 -0700)]
"KRS39E"
Ying Wang [Thu, 8 Aug 2013 23:34:29 +0000 (16:34 -0700)]
Don't bother going through the source tree
Don't bother going through the source tree in more circumstances:
all cleaning goals, helping goals, no-deps goals.
Bug:
10244578
Change-Id: Id53a249085c62838e4193962a85e0ac34f46954f
The Android Automerger [Fri, 9 Aug 2013 16:57:42 +0000 (09:57 -0700)]
"KRS39D"
The Android Automerger [Fri, 9 Aug 2013 00:57:14 +0000 (17:57 -0700)]
KRS39C
The Android Automerger [Thu, 8 Aug 2013 22:02:26 +0000 (15:02 -0700)]
"KRS39B"
The Android Open Source Project [Thu, 8 Aug 2013 21:14:13 +0000 (14:14 -0700)]
am
f66a269f: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge
* commit '
f66a269fa4300fa691348bdd55a2a16ff55de608':
JWR66W
JSS15O
JLS36
JSS15N
"JSS15M"
"JSS15L"
"JSS15K"
The Android Automerger [Thu, 8 Aug 2013 14:55:42 +0000 (07:55 -0700)]
"KRS39"
The Android Automerger [Thu, 8 Aug 2013 14:53:12 +0000 (07:53 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Thu, 8 Aug 2013 14:47:58 +0000 (07:47 -0700)]
Fix klp-dev build file
The Android Automerger [Thu, 8 Aug 2013 14:39:23 +0000 (07:39 -0700)]
"KRS39B"
The Android Automerger [Thu, 8 Aug 2013 14:37:17 +0000 (07:37 -0700)]
merge in klp-dev history after reset to master
Jason Monk [Thu, 8 Aug 2013 02:41:28 +0000 (02:41 +0000)]
Merge "Add libpac, pacserver, and ProxyHandler to build."
Jason Monk [Tue, 16 Jul 2013 14:26:09 +0000 (10:26 -0400)]
Add libpac, pacserver, and ProxyHandler to build.
This allows frameworks to reference libpac, ProxyHandler and pacserver as
required to add PAC support.
bug:
10182711
Change-Id: Iffac836a517518bd4b9a473e09372fbd10315539
The Android Automerger [Wed, 7 Aug 2013 23:28:09 +0000 (16:28 -0700)]
"KRS38B"
The Android Open Source Project [Wed, 7 Aug 2013 16:42:55 +0000 (09:42 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge
Change-Id: Ib795b6944220a2b13f6def23ee279815e53ac6b4
The Android Automerger [Wed, 7 Aug 2013 16:23:00 +0000 (09:23 -0700)]
Fix dev branch Build ID
The Android Automerger [Wed, 7 Aug 2013 16:16:08 +0000 (09:16 -0700)]
"KRS38B"
The Android Automerger [Wed, 7 Aug 2013 13:02:09 +0000 (06:02 -0700)]
"KRS38"
The Android Automerger [Wed, 7 Aug 2013 13:00:15 +0000 (06:00 -0700)]
merge in klp-release history after reset to master
The Android Automerger [Wed, 7 Aug 2013 03:33:52 +0000 (20:33 -0700)]
JWR66W
The Android Automerger [Wed, 7 Aug 2013 03:09:28 +0000 (20:09 -0700)]
JSS15O
Mike Lockwood [Tue, 6 Aug 2013 23:07:13 +0000 (16:07 -0700)]
Fix typo from previous change to fix the build
Change-Id: I6cf7217eb81abd794339143b7c23456b68808caf
The Android Automerger [Tue, 6 Aug 2013 22:23:40 +0000 (15:23 -0700)]
"KRS37B"
Mike Lockwood [Tue, 6 Aug 2013 22:07:18 +0000 (15:07 -0700)]
Add support for overriding default Java libraries on a per-target basis
Change-Id: I425041554867a7ed7d74e1d603f160b2110bc86b
The Android Automerger [Tue, 6 Aug 2013 15:19:01 +0000 (08:19 -0700)]
"KRS37"
The Android Automerger [Tue, 6 Aug 2013 15:16:59 +0000 (08:16 -0700)]
merge in klp-release history after reset to master
The Android Automerger [Tue, 6 Aug 2013 00:10:10 +0000 (17:10 -0700)]
KRS36B
Stuart Scott [Mon, 5 Aug 2013 22:21:00 +0000 (15:21 -0700)]
Add boot jars to fix Dalvik missing bootclasspath for mini emulator.
bug:
10146858
Change-Id: I159a5951a036f32c7eb02569c5b0fb12ce3a76dd
The Android Automerger [Mon, 5 Aug 2013 22:25:41 +0000 (15:25 -0700)]
JLS36
The Android Automerger [Mon, 5 Aug 2013 18:12:19 +0000 (11:12 -0700)]
JSS15N
The Android Automerger [Mon, 5 Aug 2013 13:04:30 +0000 (06:04 -0700)]
"KRS36"
The Android Automerger [Mon, 5 Aug 2013 13:00:48 +0000 (06:00 -0700)]
merge in klp-release history after reset to master
Ying Wang [Sat, 3 Aug 2013 00:58:22 +0000 (17:58 -0700)]
am
4a0929e3: am
38775140: am
08c07c59: Merge "Remove unnecessary dependencies between host and target modules." into jb-mr2-dev
* commit '
4a0929e3590b08838280bffae56d357a6194260e':
Remove unnecessary dependencies between host and target modules.
Stephen Hines [Sat, 3 Aug 2013 00:50:03 +0000 (17:50 -0700)]
resolved conflicts for merge of
79ee17ea to master
Change-Id: I78ae4a54bdc05df984061ac0b0d0fc3488b0534e
Ying Wang [Sat, 3 Aug 2013 00:40:59 +0000 (17:40 -0700)]
am
38775140: am
08c07c59: Merge "Remove unnecessary dependencies between host and target modules." into jb-mr2-dev
* commit '
387751401ca83e4419444247a176f2ea1f35a50b':
Remove unnecessary dependencies between host and target modules.
Stephen Hines [Sat, 3 Aug 2013 00:40:58 +0000 (17:40 -0700)]
am
367e56f1: am
3fc8dacd: Remove abcc from build.
* commit '
367e56f1b7d79086785f61c8c522644f134c3136':
Remove abcc from build.
Ying Wang [Sat, 3 Aug 2013 00:39:01 +0000 (17:39 -0700)]
am
08c07c59: Merge "Remove unnecessary dependencies between host and target modules." into jb-mr2-dev
* commit '
08c07c590322e1cbc8464dd371a2e5120b88e38d':
Remove unnecessary dependencies between host and target modules.
Stephen Hines [Sat, 3 Aug 2013 00:38:59 +0000 (17:38 -0700)]
am
3fc8dacd: Remove abcc from build.
* commit '
3fc8dacd9209a846de34edaee0dc14d50cae3d25':
Remove abcc from build.
Ying Wang [Fri, 2 Aug 2013 21:51:09 +0000 (21:51 +0000)]
Merge "Remove unnecessary dependencies between host and target modules." into jb-mr2-dev
The Android Automerger [Fri, 2 Aug 2013 21:42:35 +0000 (14:42 -0700)]
"KRS31E"
Ying Wang [Fri, 2 Aug 2013 21:29:02 +0000 (14:29 -0700)]
Let apicheck visible to unbundled build.
Change-Id: I22cd1e67aeb6bf23229016215ee0a15f5116513f
(cherry picked from commit
48d132659ebf99cf41d9fbf62ab1f09604938ca7)
The Android Automerger [Fri, 2 Aug 2013 20:54:06 +0000 (13:54 -0700)]
"JSS15M"
Ying Wang [Fri, 2 Aug 2013 20:31:53 +0000 (20:31 +0000)]
Merge "Don't check build prebuilt modules."
Ying Wang [Fri, 2 Aug 2013 20:30:54 +0000 (13:30 -0700)]
Don't check build prebuilt modules.
Change-Id: I35bcd97cf41d1f6e0cdc2676a07127bff4f14e6d
Stephen Hines [Thu, 6 Jun 2013 03:25:40 +0000 (20:25 -0700)]
Remove abcc from build.
Change-Id: I9ca5deea98adbba03081349c16a391a9dd84e347
Ying Wang [Fri, 2 Aug 2013 18:07:44 +0000 (11:07 -0700)]
am
a3827c4b: am
840f9d0a: Merge "Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt"
* commit '
a3827c4b6c1a4c5a1618515ccb8fc6692837ee71':
Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt
Ying Wang [Fri, 2 Aug 2013 18:05:23 +0000 (11:05 -0700)]
am
840f9d0a: Merge "Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt"
* commit '
840f9d0a274cffbef790dc20cd4f9eec27c3841b':
Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt
Ying Wang [Fri, 2 Aug 2013 17:53:15 +0000 (17:53 +0000)]
Merge "Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt"
Stuart Scott [Fri, 2 Aug 2013 17:37:41 +0000 (17:37 +0000)]
Merge "Changing make hierarchy of mini."
Ying Wang [Fri, 2 Aug 2013 17:19:30 +0000 (17:19 +0000)]
Merge "Split the product-graph build commands"
Brian Carlstrom [Fri, 2 Aug 2013 06:31:19 +0000 (23:31 -0700)]
Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt
Change-Id: I8be48114b43e46255977be1677b0c0bbccdf9163
Stuart Scott [Thu, 1 Aug 2013 21:31:54 +0000 (14:31 -0700)]
Changing make hierarchy of mini.
bug:
8503391
Change-Id: I22f2048cec7f232010e00109ef82bed271602cb1
Daniel Sandler [Fri, 2 Aug 2013 01:49:32 +0000 (01:49 +0000)]
Merge "Add --exact flag to `pid` tool; new `qpid` tool."
Scott Main [Fri, 2 Aug 2013 01:37:40 +0000 (18:37 -0700)]
am
76451706: am
bb385125: am
3b90aff0: add fixed size to training icons (and remove whitespaces)
* commit '
76451706d86daaf38889254f56e47ba989619b9c':
add fixed size to training icons (and remove whitespaces)
Scott Main [Fri, 2 Aug 2013 01:35:27 +0000 (18:35 -0700)]
am
bb385125: am
3b90aff0: add fixed size to training icons (and remove whitespaces)
* commit '
bb385125dcb04ec765d6837c576d487326d5fcb4':
add fixed size to training icons (and remove whitespaces)
Scott Main [Fri, 2 Aug 2013 01:33:32 +0000 (18:33 -0700)]
am
3b90aff0: add fixed size to training icons (and remove whitespaces)
* commit '
3b90aff04cf7ef434baf47b3eb4c73a7ecad8764':
add fixed size to training icons (and remove whitespaces)
Scott Main [Fri, 2 Aug 2013 01:09:35 +0000 (18:09 -0700)]
add fixed size to training icons (and remove whitespaces)
Change-Id: Iad8b597b9f181833d9f1d63e128abb49486fa543
Ying Wang [Fri, 2 Aug 2013 00:45:35 +0000 (17:45 -0700)]
Split the product-graph build commands
1) As more product configuration files are added to the source tree, the
command line has become too long.
2) Escape "(" and ")" that may may appear in PRODUCT_MODEL.
Change-Id: I08f278dce434050f013498327c7cbf3592512460
Ying Wang [Thu, 1 Aug 2013 22:41:53 +0000 (15:41 -0700)]
Delete the kernel file when build config is changed
Now we have products of the same device type but with different kernel,
and we want to do incremental build on them.
Bug:
10133257
Change-Id: Iff4aae11e474d2822f02c62822bd028a5ba5b47a
The Android Automerger [Thu, 1 Aug 2013 21:42:54 +0000 (14:42 -0700)]
"KRS31D"
The Android Automerger [Thu, 1 Aug 2013 20:44:11 +0000 (13:44 -0700)]
"JSS15L"
Ying Wang [Fri, 7 Jun 2013 01:05:53 +0000 (18:05 -0700)]
Remove unnecessary dependencies between host and target modules.
With this change, modules introduced by LOCAL_REQUIRED_MODULES will be
split by host/target: target modules only depend on target modules and
host modules only depend on host modules.
Bug:
9303948
Change-Id: I4078a7983aa3c00e99534f3f170dfe4b66b12287
The Android Automerger [Thu, 1 Aug 2013 00:40:39 +0000 (17:40 -0700)]
"KRS31C"
Ying Wang [Wed, 31 Jul 2013 23:54:07 +0000 (23:54 +0000)]
Merge "Error and exit if BUILD_MULTI_PREBUILT is incorrectly used"
Ying Wang [Wed, 31 Jul 2013 23:26:01 +0000 (16:26 -0700)]
Error and exit if BUILD_MULTI_PREBUILT is incorrectly used
Bug:
10114476
Change-Id: Id51e7ca443c3742e17cbe114aefbb7ed3870b0e5
Elliott Hughes [Wed, 31 Jul 2013 23:25:26 +0000 (16:25 -0700)]
Remove one last icu.dat.
Change-Id: Iadeae68e49b18d735e7cfc263800c96998efd23b
Elliott Hughes [Wed, 31 Jul 2013 22:49:04 +0000 (15:49 -0700)]
resolved conflicts for merge of
8714c831 to master
Change-Id: I58a6ab217aeaa5de099a9d79d1830c833f718a9d
Elliott Hughes [Wed, 31 Jul 2013 22:43:11 +0000 (15:43 -0700)]
am
2266fa92: Merge "Remove the bogus icu.dat dependency."
* commit '
2266fa92a856a81fdfc5e6c5d9b073b2d6173a02':
Remove the bogus icu.dat dependency.
Elliott Hughes [Wed, 31 Jul 2013 22:35:47 +0000 (22:35 +0000)]
Merge "Remove the bogus icu.dat dependency."
Elliott Hughes [Wed, 31 Jul 2013 22:02:17 +0000 (15:02 -0700)]
Remove the bogus icu.dat dependency.
Simply depending on the icu4c libraries now pulls in the appropriate
data files for you.
Change-Id: Ied659584b2583c92d871c5823988ce0a865eabe4
Ying Wang [Wed, 31 Jul 2013 19:18:36 +0000 (12:18 -0700)]
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
Andy McFadden [Wed, 31 Jul 2013 14:29:25 +0000 (14:29 +0000)]
Merge "Add screenrecord"
The Android Automerger [Wed, 31 Jul 2013 13:03:31 +0000 (06:03 -0700)]
"KRS31B"
The Android Automerger [Wed, 31 Jul 2013 13:00:24 +0000 (06:00 -0700)]
merge in klp-release history after reset to master
Daniel Sandler [Tue, 30 Jul 2013 17:23:52 +0000 (13:23 -0400)]
Add --exact flag to `pid` tool; new `qpid` tool.
The new --exact flag for pid does an exact match on the
process name, rather than grepping anywhere in the ps
output, which helps target a specific process if its name is
a substring of another process name. (Nothing else about
pid's output, including inclusion of the ps header if it
matches, is affected.)
qpid ("quick pid" or "quiet pid") lists all processes in the
following simplified format:
<pid> <procname>
It also helpfully strips off the header line from ps.
With an argument, qpid will search for processes or pids
matching the argument. With --exact it matches process names
exactly (as does pid, above).
Change-Id: I28a201df40281a66cb1a2918b7ee3a0b2d7b6ffd
Scott Main [Wed, 31 Jul 2013 03:18:41 +0000 (20:18 -0700)]
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
Scott Main [Wed, 31 Jul 2013 03:18:40 +0000 (20:18 -0700)]
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
Scott Main [Wed, 31 Jul 2013 03:13:31 +0000 (20:13 -0700)]
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
Scott Main [Wed, 31 Jul 2013 03:13:30 +0000 (20:13 -0700)]
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
Scott Main [Wed, 31 Jul 2013 03:09:21 +0000 (20:09 -0700)]
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
Scott Main [Wed, 31 Jul 2013 03:09:21 +0000 (20:09 -0700)]
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
The Android Automerger [Wed, 31 Jul 2013 01:18:58 +0000 (18:18 -0700)]
"KRS30D"
Scott Main [Wed, 31 Jul 2013 01:14:33 +0000 (01:14 +0000)]
Merge "fix sidebar autoscroll when the selected doc is not visible. bug:
9676913" into jb-mr2-docs
Scott Main [Wed, 31 Jul 2013 01:00:51 +0000 (18:00 -0700)]
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
Andy McFadden [Wed, 31 Jul 2013 00:17:51 +0000 (17:17 -0700)]
Add screenrecord
Add the "screenrecord" command for all builds of most devices.
Change-Id: Ib4f37cc219a8d2f9a09ac3f457e5f94506a4d88d
Scott Main [Tue, 30 Jul 2013 21:56:45 +0000 (14:56 -0700)]
add 'wide' version of design/develop cross-link buttons.
Primarily for training pages, which have a wider TOC box
Change-Id: I29644596e72e43432f7bd00fd6a5aabf7e3a6bb7
Joe Fernandez [Tue, 30 Jul 2013 21:56:25 +0000 (14:56 -0700)]
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
Joe Fernandez [Tue, 30 Jul 2013 21:53:07 +0000 (14:53 -0700)]
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
Joe Fernandez [Tue, 30 Jul 2013 21:41:58 +0000 (14:41 -0700)]
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
The Android Automerger [Tue, 30 Jul 2013 20:19:42 +0000 (13:19 -0700)]
"KRS30C"
The Android Automerger [Tue, 30 Jul 2013 18:12:08 +0000 (11:12 -0700)]
"KRS30B"
The Android Automerger [Tue, 30 Jul 2013 18:08:40 +0000 (11:08 -0700)]
merge in klp-release history after reset to master
Jean-Baptiste Queru [Tue, 30 Jul 2013 17:28:17 +0000 (10:28 -0700)]
am
50a402af: am
f1534b62: Merge "Added generic hook for loading vendor specific defintions"
* commit '
50a402af7ae550c96b9142ab56d3a23a8a8d22b1':
Added generic hook for loading vendor specific defintions
Jean-Baptiste Queru [Tue, 30 Jul 2013 14:33:53 +0000 (07:33 -0700)]
am
f1534b62: Merge "Added generic hook for loading vendor specific defintions"
* commit '
f1534b6292a609bb5f55c4a617f3cd1054f90a81':
Added generic hook for loading vendor specific defintions