OSDN Git Service
Jeff Brown [Wed, 21 Aug 2013 00:29:46 +0000 (00:29 +0000)]
Merge "Enhance 'stacks' script to handle native processes." into klp-dev
Scott Main [Wed, 21 Aug 2013 00:28:14 +0000 (17:28 -0700)]
am
feb45280: am
8088dd2f: am
ad08f07c: new version of script to build sidenav lists dynamically. This is currently used only by the samples nav, but we\'ll later update to handle the Google reference nav as well
* commit '
feb45280aa67e4fd7280d15caae3673b82895624':
new version of script to build sidenav lists dynamically. This is currently used only by the samples nav, but we'll later update to handle the Google reference nav as well
Scott Main [Wed, 21 Aug 2013 00:24:01 +0000 (17:24 -0700)]
am
8088dd2f: am
ad08f07c: new version of script to build sidenav lists dynamically. This is currently used only by the samples nav, but we\'ll later update to handle the Google reference nav as well
* commit '
8088dd2f83ae17a1343de87750d39f8264d7b7bc':
new version of script to build sidenav lists dynamically. This is currently used only by the samples nav, but we'll later update to handle the Google reference nav as well
Scott Main [Wed, 21 Aug 2013 00:21:31 +0000 (17:21 -0700)]
am
ad08f07c: new version of script to build sidenav lists dynamically. This is currently used only by the samples nav, but we\'ll later update to handle the Google reference nav as well
* commit '
ad08f07cf2ece7a3711eafa382cf741134c69083':
new version of script to build sidenav lists dynamically. This is currently used only by the samples nav, but we'll later update to handle the Google reference nav as well
Scott Main [Tue, 20 Aug 2013 23:49:57 +0000 (16:49 -0700)]
new version of script to build sidenav lists dynamically.
This is currently used only by the samples nav, but we'll
later update to handle the Google reference nav as well
Change-Id: I907ea8cb096148ba50808623ed872c8defc9a135
Jason Monk [Tue, 20 Aug 2013 23:36:44 +0000 (23:36 +0000)]
Merge "Remove old PAC dependency and add new one." into klp-dev
Jeff Brown [Mon, 19 Aug 2013 22:14:16 +0000 (15:14 -0700)]
Enhance 'stacks' script to handle native processes.
Automatically detects whether the process is native or managed
and dumps the stacks accordingly.
Change-Id: Ifba65279f1d1b9714b66aa6990bab05575871d28
Dirk Dougherty [Mon, 19 Aug 2013 22:02:50 +0000 (15:02 -0700)]
am
337ebc19: am
62c755a5: am
f5ffd4a4: Clean up core css changes brought in with samples css.
* commit '
337ebc195ff7ebb4f12b9012ccfc9f89a8a66570':
Clean up core css changes brought in with samples css.
Dirk Dougherty [Mon, 19 Aug 2013 22:00:39 +0000 (15:00 -0700)]
am
62c755a5: am
f5ffd4a4: Clean up core css changes brought in with samples css.
* commit '
62c755a52a74dc2f887d51d48105eebff17a6346':
Clean up core css changes brought in with samples css.
Dirk Dougherty [Mon, 19 Aug 2013 21:57:19 +0000 (14:57 -0700)]
am
f5ffd4a4: Clean up core css changes brought in with samples css.
* commit '
f5ffd4a40c7a2165ff6ebe24a2aa189dea6b1806':
Clean up core css changes brought in with samples css.
Jason Monk [Mon, 19 Aug 2013 19:42:32 +0000 (15:42 -0400)]
Remove old PAC dependency and add new one.
PAC support has been changed from a standalone executable to an apk
that needs to be part of the build. This removes the old depency
and adds the new one.
Bug:
10182711
Change-Id: I1291f54d81e6ec0c775e045a3446bd0cffb40019
Dirk Dougherty [Mon, 19 Aug 2013 19:26:07 +0000 (12:26 -0700)]
Clean up core css changes brought in with samples css.
Change-Id: I0920695be4f6ed7085508a4451c13bc7d9e65d9a
Dirk Dougherty [Mon, 19 Aug 2013 19:14:19 +0000 (12:14 -0700)]
am
6d244fb2: am
d5ac8330: am
4f7e5159: doc change: Samples browsing: basic support in templates and js/css.
* commit '
6d244fb2ed0abdf843c33fca3a2ba2557ac921aa':
doc change: Samples browsing: basic support in templates and js/css.
Dirk Dougherty [Mon, 19 Aug 2013 19:12:07 +0000 (12:12 -0700)]
am
d5ac8330: am
4f7e5159: doc change: Samples browsing: basic support in templates and js/css.
* commit '
d5ac833061b2233b71a60155656ca97cd5494746':
doc change: Samples browsing: basic support in templates and js/css.
Dirk Dougherty [Mon, 19 Aug 2013 19:09:46 +0000 (12:09 -0700)]
am
4f7e5159: doc change: Samples browsing: basic support in templates and js/css.
* commit '
4f7e5159409e71ecfeba86858f5ec044d043aff8':
doc change: Samples browsing: basic support in templates and js/css.
Dirk Dougherty [Thu, 16 Sep 2010 17:43:40 +0000 (10:43 -0700)]
doc change: Samples browsing: basic support in templates and js/css.
Change-Id: Ie2323f5323c624420c90c8c782b840f183238f7c
Ying Wang [Fri, 16 Aug 2013 20:24:47 +0000 (13:24 -0700)]
Add phony goal GET-INSTALL-PATH
It can be used as a goal of mm/mmm.
It prints out modules' install paths, which can be used by the runtest
utility.
Change-Id: If113e4c990b672acbacf723104583c0157d43c3b
Scott Main [Thu, 15 Aug 2013 21:51:37 +0000 (14:51 -0700)]
am
ce478d54: am
7e453280: am
52dd2067: fix two bugs in site script. 1. Fix URL path check for reference docs to initalize api level and sidenav. Previously, this condition was never true, so the sidenav would not be initialized under default conditions and the referen
* commit '
ce478d54ad619c11b796b6286357c3203544d90d':
fix two bugs in site script. 1. Fix URL path check for reference docs to initalize api level and sidenav. Previously, this condition was never true, so the sidenav would not be initialized under default conditions and the reference drag bar would not appear. 2. Fix the recent change to the 'scroll into view' script so that it works properly in a multi-pane sidenav (reference docs) by again making the offset measurement relative to the parent container (but much better than was done before).
Scott Main [Thu, 15 Aug 2013 21:45:35 +0000 (14:45 -0700)]
am
7e453280: am
52dd2067: fix two bugs in site script. 1. Fix URL path check for reference docs to initalize api level and sidenav. Previously, this condition was never true, so the sidenav would not be initialized under default conditions and the reference drag bar w
* commit '
7e453280539406882215a0602ae6f63d7585fb9f':
fix two bugs in site script. 1. Fix URL path check for reference docs to initalize api level and sidenav. Previously, this condition was never true, so the sidenav would not be initialized under default conditions and the reference drag bar would not appear. 2. Fix the recent change to the 'scroll into view' script so that it works properly in a multi-pane sidenav (reference docs) by again making the offset measurement relative to the parent container (but much better than was done before).
Scott Main [Thu, 15 Aug 2013 21:43:45 +0000 (14:43 -0700)]
am
52dd2067: fix two bugs in site script. 1. Fix URL path check for reference docs to initalize api level and sidenav. Previously, this condition was never true, so the sidenav would not be initialized under default conditions and the reference drag bar would not appe
* commit '
52dd206715e9d8e80a22c7106ec783324d51e747':
fix two bugs in site script. 1. Fix URL path check for reference docs to initalize api level and sidenav. Previously, this condition was never true, so the sidenav would not be initialized under default conditions and the reference drag bar would not appear. 2. Fix the recent change to the 'scroll into view' script so that it works properly in a multi-pane sidenav (reference docs) by again making the offset measurement relative to the parent container (but much better than was done before).
Ying Wang [Thu, 15 Aug 2013 21:34:09 +0000 (14:34 -0700)]
am
fc8b6338: resolved conflicts for merge of
d65a7da3 to jb-mr2-dev-plus-aosp
* commit '
fc8b6338510690f1f87c57b9d9c470e25fc48bcd':
No need to filter out AndroidConfig.h for unbundled build
Scott Main [Thu, 15 Aug 2013 19:22:28 +0000 (12:22 -0700)]
fix two bugs in site script.
1. Fix URL path check for reference docs to initalize api level and sidenav.
Previously, this condition was never true, so the sidenav would not be initialized
under default conditions and the reference drag bar would not appear.
2. Fix the recent change to the 'scroll into view' script so that it works
properly in a multi-pane sidenav (reference docs) by again making the offset
measurement relative to the parent container (but much better than was done before).
Change-Id: I2a31ed59d772346651c2432f0ed26530983c49ff
Ying Wang [Thu, 15 Aug 2013 19:02:30 +0000 (12:02 -0700)]
resolved conflicts for merge of
d65a7da3 to jb-mr2-dev-plus-aosp
Change-Id: I14c4ddf5f02c8dec86f45bedf679bcebff1448dc
Ying Wang [Thu, 15 Aug 2013 18:55:46 +0000 (11:55 -0700)]
am
f4723fa4: No need to filter out AndroidConfig.h for unbundled build
* commit '
f4723fa49b6e61f727b6321a4006ee8ba3f393b9':
No need to filter out AndroidConfig.h for unbundled build
Ying Wang [Thu, 15 Aug 2013 18:01:10 +0000 (11:01 -0700)]
No need to filter out AndroidConfig.h for unbundled build
for now we have all AndroidConfig.hs in the build project.
Change-Id: Id713fecba1378fad81688f5937f61c779b618ac2
Vineeta Srivastava [Wed, 14 Aug 2013 20:28:06 +0000 (13:28 -0700)]
Fix missing camera from aosp builds.
Camera is no longer part of Gallery2 application. Added Camera2 for aosp builds.
Bug:
10324351
Change-Id: I6c468344af04106704876ac945ccaffd9be1674b
The Android Open Source Project [Wed, 14 Aug 2013 19:16:12 +0000 (12:16 -0700)]
am
fb2188d1: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
fb2188d1390841285181256a0ec37c5558c971da':
"JWR66Y"
The Android Open Source Project [Wed, 14 Aug 2013 19:06:41 +0000 (12:06 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I61c47285d236337a033e001c3b84a9631895bc5b
Ying Wang [Wed, 14 Aug 2013 16:28:18 +0000 (09:28 -0700)]
am
396fd67d: am
b9eee184: am
e391e7a8: Remove -allowaccessmodification from the basic Proguard flags
* commit '
396fd67d7a691a1226783f1b15442af86137eb3d':
Remove -allowaccessmodification from the basic Proguard flags
Ying Wang [Wed, 14 Aug 2013 16:26:06 +0000 (09:26 -0700)]
am
b9eee184: am
e391e7a8: Remove -allowaccessmodification from the basic Proguard flags
* commit '
b9eee184f2ab291f5af6520c41f90a8857c4bd73':
Remove -allowaccessmodification from the basic Proguard flags
Ying Wang [Wed, 14 Aug 2013 16:22:01 +0000 (09:22 -0700)]
am
e391e7a8: Remove -allowaccessmodification from the basic Proguard flags
* commit '
e391e7a86e806bd3d2549b6d12736166fafb746f':
Remove -allowaccessmodification from the basic Proguard flags
Ying Wang [Wed, 14 Aug 2013 00:40:24 +0000 (17:40 -0700)]
Remove -allowaccessmodification from the basic Proguard flags
It seems with that flag Proguard modifies the class files in a way that
Dalvik does not like.
Bug:
10307364
Change-Id: If0cc7552da00ae8a3a3a39a9f2f029819ca3164a
The Android Automerger [Tue, 13 Aug 2013 22:20:55 +0000 (15:20 -0700)]
"JWR66Y"
Santos Cordon [Tue, 13 Aug 2013 22:11:25 +0000 (22:11 +0000)]
Merge "The big switch. Enabling InCallUi/Phone split by default." into klp-dev
Ying Wang [Tue, 13 Aug 2013 19:35:10 +0000 (12:35 -0700)]
Support for LOCAL_HAL_STATIC_LIBRARIES
Now you can have a board config variable BOARD_HAL_STATIC_LIBRARIES,
which is a list of board-specific HAL static library names with pattern
"lib<library_name>.<board_specific_suffix>". LOCAL_HAL_STATIC_LIBRARIES
is a list of "lib<library_name>" and any matched
BOARD_HAL_STATIC_LIBRARIES will be added to the LOCAL_STATIC_LIBRARIES;
if no match is found, lib<library_name>.default will be used.
Bug:
10262105
Change-Id: Ic89d8d417d1dd65a227e4187a157fd3b77c4af34
The Android Open Source Project [Tue, 13 Aug 2013 17:11:58 +0000 (10:11 -0700)]
am
5aac97cb: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge
* commit '
5aac97cbfcb3f638805311ffe733e5bf6dc29747':
"JLS36B"
JWR66X
JSS15P
The Android Open Source Project [Tue, 13 Aug 2013 17:09:56 +0000 (10:09 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge
Change-Id: I80fa0805a168773ba273726fb4827b6cc24bfb08
Santos Cordon [Tue, 13 Aug 2013 04:42:24 +0000 (21:42 -0700)]
The big switch. Enabling InCallUi/Phone split by default.
.:::. .:::.
:::::::.:::::::
:::::::::::::::
':::::::::::::'
':::::::::'
':::::'
':'
with love, from California
Change-Id: Iba25accb46f81f0c36a9e3f1df0f990e27f51b9f
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 [Thu, 8 Aug 2013 23:53:41 +0000 (16:53 -0700)]
"JLS36B"
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: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:10:36 +0000 (16:10 -0700)]
JWR66X
The Android Automerger [Wed, 7 Aug 2013 23:02:33 +0000 (16:02 -0700)]
JSS15P
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 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
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
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
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
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 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
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"
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