OSDN Git Service

android-x86/build.git
10 years agoam 2e45116d: am 515e0465: Merge "FDO: do not support host modules"
Ying Wang [Fri, 9 Aug 2013 19:47:16 +0000 (12:47 -0700)]
am 2e45116d: am 515e0465: Merge "FDO: do not support host modules"

* commit '2e45116d3a9c1ab055dd7a6a93bb4ab79414c081':
  FDO: do not support host modules

10 years agoam 515e0465: Merge "FDO: do not support host modules"
Ying Wang [Fri, 9 Aug 2013 19:45:00 +0000 (12:45 -0700)]
am 515e0465: Merge "FDO: do not support host modules"

* commit '515e0465d169905e7e454207f3cbb2a57a033ae1':
  FDO: do not support host modules

10 years agoam f66a269f: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2...
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"

10 years agoMerge "FDO: do not support host modules"
Ying Wang [Thu, 8 Aug 2013 18:54:20 +0000 (18:54 +0000)]
Merge "FDO: do not support host modules"

10 years agoFix klp-dev build file
The Android Automerger [Thu, 8 Aug 2013 14:47:58 +0000 (07:47 -0700)]
Fix klp-dev build file

10 years ago"KRS39B"
The Android Automerger [Thu, 8 Aug 2013 14:39:23 +0000 (07:39 -0700)]
"KRS39B"

10 years agomerge in klp-dev history after reset to master
The Android Automerger [Thu, 8 Aug 2013 14:37:17 +0000 (07:37 -0700)]
merge in klp-dev history after reset to master

10 years agoMerge "Add libpac, pacserver, and ProxyHandler to build."
Jason Monk [Thu, 8 Aug 2013 02:41:28 +0000 (02:41 +0000)]
Merge "Add libpac, pacserver, and ProxyHandler to build."

10 years agoAdd 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

10 years agoReconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release ...
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

10 years agoFix dev branch Build ID
The Android Automerger [Wed, 7 Aug 2013 16:23:00 +0000 (09:23 -0700)]
Fix dev branch Build ID

10 years ago"KRS38B"
The Android Automerger [Wed, 7 Aug 2013 16:16:08 +0000 (09:16 -0700)]
"KRS38B"

11 years agoJWR66W
The Android Automerger [Wed, 7 Aug 2013 03:33:52 +0000 (20:33 -0700)]
JWR66W

11 years agoJSS15O
The Android Automerger [Wed, 7 Aug 2013 03:09:28 +0000 (20:09 -0700)]
JSS15O

11 years agoFix typo from previous change to fix the build
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

11 years agoAdd support for overriding default Java libraries on a per-target basis
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

11 years agoAdd boot jars to fix Dalvik missing bootclasspath for mini emulator.
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

11 years agoJLS36
The Android Automerger [Mon, 5 Aug 2013 22:25:41 +0000 (15:25 -0700)]
JLS36

11 years agoJSS15N
The Android Automerger [Mon, 5 Aug 2013 18:12:19 +0000 (11:12 -0700)]
JSS15N

11 years agoFDO: do not support host modules
synergydev [Mon, 5 Aug 2013 09:44:37 +0000 (02:44 -0700)]
FDO: do not support host modules

Summary:
If built with BUILD_FDO_INSTRUMENT alone, host modules will fail at runtime (during build)
due to failing to create /data in most standard unix user permission cases. If the user does
have full permission to /, /data/profile/ will be created and profiles will be generated there.
Any file generation in the Android Build System should be kept to $OUT.

This commit fixes this bug.

Test Plan:
Build with BUILD_FDO_INSTRUMENT without additional configuration, and host modules will no longer generate profiles
at their runtime.

11 years agoam 4a0929e3: am 38775140: am 08c07c59: Merge "Remove unnecessary dependencies between...
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.

11 years agoresolved conflicts for merge of 79ee17ea to master
Stephen Hines [Sat, 3 Aug 2013 00:50:03 +0000 (17:50 -0700)]
resolved conflicts for merge of 79ee17ea to master

Change-Id: I78ae4a54bdc05df984061ac0b0d0fc3488b0534e

11 years agoam 38775140: am 08c07c59: Merge "Remove unnecessary dependencies between host and...
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.

11 years agoam 367e56f1: am 3fc8dacd: Remove abcc from build.
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.

11 years agoam 08c07c59: Merge "Remove unnecessary dependencies between host and target modules...
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.

11 years agoam 3fc8dacd: Remove abcc from build.
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.

11 years agoMerge "Remove unnecessary dependencies between host and target modules." into jb...
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

11 years agoLet apicheck visible to unbundled build.
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)

11 years ago"JSS15M"
The Android Automerger [Fri, 2 Aug 2013 20:54:06 +0000 (13:54 -0700)]
"JSS15M"

11 years agoMerge "Don't check build prebuilt modules."
Ying Wang [Fri, 2 Aug 2013 20:31:53 +0000 (20:31 +0000)]
Merge "Don't check build prebuilt modules."

11 years agoDon'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

11 years agoRemove abcc from build.
Stephen Hines [Thu, 6 Jun 2013 03:25:40 +0000 (20:25 -0700)]
Remove abcc from build.

Change-Id: I9ca5deea98adbba03081349c16a391a9dd84e347

11 years agoam a3827c4b: am 840f9d0a: Merge "Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt"
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

11 years agoam 840f9d0a: Merge "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

11 years agoMerge "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"

11 years agoMerge "Changing make hierarchy of mini."
Stuart Scott [Fri, 2 Aug 2013 17:37:41 +0000 (17:37 +0000)]
Merge "Changing make hierarchy of mini."

11 years agoMerge "Split the product-graph build commands"
Ying Wang [Fri, 2 Aug 2013 17:19:30 +0000 (17:19 +0000)]
Merge "Split the product-graph build commands"

11 years agoRemove BUILD_HOST_JAVA_LIBRARY dependency on aapt
Brian Carlstrom [Fri, 2 Aug 2013 06:31:19 +0000 (23:31 -0700)]
Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt

Change-Id: I8be48114b43e46255977be1677b0c0bbccdf9163

11 years agoChanging make hierarchy of mini.
Stuart Scott [Thu, 1 Aug 2013 21:31:54 +0000 (14:31 -0700)]
Changing make hierarchy of mini.

bug: 8503391

Change-Id: I22f2048cec7f232010e00109ef82bed271602cb1

11 years agoMerge "Add --exact flag to `pid` tool; new `qpid` tool."
Daniel Sandler [Fri, 2 Aug 2013 01:49:32 +0000 (01:49 +0000)]
Merge "Add --exact flag to `pid` tool; new `qpid` tool."

11 years agoam 76451706: am bb385125: am 3b90aff0: add fixed size to training icons (and remove...
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)

11 years agoam bb385125: am 3b90aff0: 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)

11 years agoam 3b90aff0: 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)

11 years agoadd 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

11 years agoSplit the product-graph build commands
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

11 years agoDelete the kernel file when build config is changed
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

11 years ago"JSS15L"
The Android Automerger [Thu, 1 Aug 2013 20:44:11 +0000 (13:44 -0700)]
"JSS15L"

11 years agoRemove unnecessary dependencies between host and target modules.
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

11 years agoMerge "Error and exit if BUILD_MULTI_PREBUILT is incorrectly used"
Ying Wang [Wed, 31 Jul 2013 23:54:07 +0000 (23:54 +0000)]
Merge "Error and exit if BUILD_MULTI_PREBUILT is incorrectly used"

11 years agoError 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

11 years agoRemove one last icu.dat.
Elliott Hughes [Wed, 31 Jul 2013 23:25:26 +0000 (16:25 -0700)]
Remove one last icu.dat.

Change-Id: Iadeae68e49b18d735e7cfc263800c96998efd23b

11 years agoresolved conflicts for merge of 8714c831 to master
Elliott Hughes [Wed, 31 Jul 2013 22:49:04 +0000 (15:49 -0700)]
resolved conflicts for merge of 8714c831 to master

Change-Id: I58a6ab217aeaa5de099a9d79d1830c833f718a9d

11 years agoam 2266fa92: Merge "Remove the bogus icu.dat dependency."
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.

11 years agoMerge "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."

11 years agoRemove 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

11 years agoMore verbose on what the build system is doing
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

11 years agoMerge "Add screenrecord"
Andy McFadden [Wed, 31 Jul 2013 14:29:25 +0000 (14:29 +0000)]
Merge "Add screenrecord"

11 years agoAdd --exact flag to `pid` tool; new `qpid` tool.
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

11 years agoam bc36e229: am d1d606b4: am c774a312: Merge "fix sidebar autoscroll when the selecte...
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

11 years agoam 65c92265: am 14066e74: am 5eccda8d: add \'wide\' version of design/develop cross...
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

11 years agoam d1d606b4: am c774a312: Merge "fix sidebar autoscroll when the selected doc is...
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

11 years agoam 14066e74: am 5eccda8d: add \'wide\' version of design/develop cross-link buttons...
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

11 years agoam c774a312: Merge "fix sidebar autoscroll when the selected doc is not visible....
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

11 years agoam 5eccda8d: add \'wide\' version of design/develop cross-link buttons. Primarily...
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

11 years agoMerge "fix sidebar autoscroll when the selected doc is not visible. bug: 9676913...
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

11 years agofix sidebar autoscroll when the selected doc is not visible.
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

11 years agoAdd screenrecord
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

11 years agoadd 'wide' version of design/develop cross-link buttons.
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

11 years agoam f4f3db60: (-s ours) am 847e02cb: am 3c1da3e2: (-s ours) DO NOT MERGE cherrypick...
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

11 years agoam 847e02cb: am 3c1da3e2: (-s ours) DO NOT MERGE cherrypick from jb-mr2-ub-dev docs...
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

11 years agoam 3c1da3e2: (-s ours) DO NOT MERGE cherrypick from jb-mr2-ub-dev docs: small fix...
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

11 years agoam 50a402af: am f1534b62: Merge "Added generic hook for loading vendor specific defin...
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

11 years agoam f1534b62: Merge "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

11 years agoMerge "Added generic hook for loading vendor specific defintions"
Jean-Baptiste Queru [Tue, 30 Jul 2013 14:26:44 +0000 (14:26 +0000)]
Merge "Added generic hook for loading vendor specific defintions"

11 years agoAdd healthd
Todd Poynor [Thu, 2 May 2013 00:30:01 +0000 (17:30 -0700)]
Add healthd

Change-Id: I055581a12fe88a4e1fb04e675036bf0d345c05c6

11 years agoam cd9cadbc: am 7768c91c: am 94de1eba: Put a copy of the radio/bootloader files in...
Ying Wang [Fri, 26 Jul 2013 20:00:20 +0000 (13:00 -0700)]
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.

11 years agoam 7768c91c: am 94de1eba: Put a copy of the radio/bootloader files in the dist dir.
Ying Wang [Fri, 26 Jul 2013 19:57:19 +0000 (12:57 -0700)]
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.

11 years agoam 94de1eba: Put a copy of the radio/bootloader files in the dist dir.
Ying Wang [Fri, 26 Jul 2013 19:54:11 +0000 (12:54 -0700)]
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.

11 years agoPut a copy of the radio/bootloader files in the dist dir.
Ying Wang [Fri, 26 Jul 2013 19:19:20 +0000 (12:19 -0700)]
Put a copy of the radio/bootloader files in the dist dir.

Bug: 10035750
Change-Id: I3b51e61ec737899d9264885a1e66c89a7a740d54

11 years agoAdded generic hook for loading vendor specific defintions
Marie Lennerhagen [Wed, 20 Oct 2010 11:41:59 +0000 (13:41 +0200)]
Added generic hook for loading vendor specific defintions

Change-Id: I6dec9c378ed0aabf9e60f8dcb05c6043bbcc30e5

11 years agoMerge "Remove WEBCORE_INSTRUMENTATION and ENABLE_SVG"
Jonathan Dixon [Fri, 26 Jul 2013 16:49:19 +0000 (16:49 +0000)]
Merge "Remove WEBCORE_INSTRUMENTATION and ENABLE_SVG"

11 years agoMerge "fix build"
keunyoung [Fri, 26 Jul 2013 01:42:03 +0000 (01:42 +0000)]
Merge "fix build"

11 years agofix build
keunyoung [Fri, 26 Jul 2013 01:20:09 +0000 (18:20 -0700)]
fix build

- PDK_FUSION_OUT_DIR was null inside macro, lead into missing copy

bug: 10023069
Change-Id: I323d2fb6a2e955f9a7c27559701a7af36a89fea8

11 years agoDO NOT MERGE
Joe Fernandez [Fri, 26 Jul 2013 00:05:06 +0000 (17:05 -0700)]
DO NOT MERGE
cherrypick from jb-mr2-ub-dev
docs: small fix for NDK download table

Change-Id: Ib014e0310960cf10566a6d04aee2acb81346a20c

11 years agoam cb4a1e67: am 8d936902: docs: small fix for NDK download table
Joe Fernandez [Fri, 26 Jul 2013 00:23:04 +0000 (17:23 -0700)]
am cb4a1e67: am 8d936902: docs: small fix for NDK download table

* commit 'cb4a1e673eafc52c496dfed294c5431c80c52688':
  docs: small fix for NDK download table

11 years agoam 8d936902: docs: small fix for NDK download table
Joe Fernandez [Fri, 26 Jul 2013 00:21:19 +0000 (17:21 -0700)]
am 8d936902: docs: small fix for NDK download table

* commit '8d9369023962fefc0b598283b6850789b26f5249':
  docs: small fix for NDK download table

11 years agodocs: small fix for NDK download table
Joe Fernandez [Fri, 26 Jul 2013 00:05:06 +0000 (17:05 -0700)]
docs: small fix for NDK download table

Change-Id: Ib014e0310960cf10566a6d04aee2acb81346a20c

11 years agoam 8574e7d9: am 48e3f1d6: Add new table rows for legacy ndk downloads.
Dirk Dougherty [Fri, 26 Jul 2013 00:04:24 +0000 (17:04 -0700)]
am 8574e7d9: am 48e3f1d6: Add new table rows for legacy ndk downloads.

* commit '8574e7d93e28069983da51ef40fa47bdc2e51daa':
  Add new table rows for legacy ndk downloads.

11 years agoam 51aab877: am 5d1db8b4: Merge "Allow proto builds to pass in java proto params."
Ying Wang [Fri, 26 Jul 2013 00:04:20 +0000 (17:04 -0700)]
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.

11 years agoam fcbc0b7f: am 5094e33b: Merge "Revert "Allow proto builds to pass in java proto...
Ulas Kirazci [Thu, 25 Jul 2013 23:34:23 +0000 (16:34 -0700)]
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."

11 years agoam 48e3f1d6: Add new table rows for legacy ndk downloads.
Dirk Dougherty [Thu, 25 Jul 2013 23:12:55 +0000 (16:12 -0700)]
am 48e3f1d6: Add new table rows for legacy ndk downloads.

* commit '48e3f1d6e40581bc4379c180b9de6fdd41026eee':
  Add new table rows for legacy ndk downloads.

11 years agoAdd new table rows for legacy ndk downloads.
Dirk Dougherty [Thu, 25 Jul 2013 22:26:07 +0000 (15:26 -0700)]
Add new table rows for legacy ndk downloads.

Change-Id: If8ebc459415a22719d351d87a55ddeb4ddb6b3ba

11 years agoRemove WEBCORE_INSTRUMENTATION and ENABLE_SVG
Jonathan Dixon [Thu, 25 Jul 2013 22:49:52 +0000 (15:49 -0700)]
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

11 years agoam 5d1db8b4: Merge "Allow proto builds to pass in java proto params."
Ying Wang [Thu, 25 Jul 2013 22:36:07 +0000 (15:36 -0700)]
am 5d1db8b4: Merge "Allow proto builds to pass in java proto params."

* commit '5d1db8b4335d554bfd7e028496f0305b78b0676b':
  Allow proto builds to pass in java proto params.

11 years agoMerge "Allow proto builds to pass in java proto params."
Ying Wang [Thu, 25 Jul 2013 22:32:08 +0000 (22:32 +0000)]
Merge "Allow proto builds to pass in java proto params."

11 years agoMerge "Add PRODUCT_BOOT_JARS to derive BOOTCLASSPATH"
Ying Wang [Thu, 25 Jul 2013 22:09:32 +0000 (22:09 +0000)]
Merge "Add PRODUCT_BOOT_JARS to derive BOOTCLASSPATH"

11 years agoAllow proto builds to pass in java proto params.
Ulas Kirazci [Thu, 25 Jul 2013 19:28:19 +0000 (12:28 -0700)]
Allow proto builds to pass in java proto params.

Change-Id: I65fe0cd96f818f59267da6159e6bd2ad28f07a11

11 years agoam 5094e33b: Merge "Revert "Allow proto builds to pass in java proto params.""
Ulas Kirazci [Thu, 25 Jul 2013 20:35:27 +0000 (13:35 -0700)]
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."

11 years agoMerge "Revert "Allow proto builds to pass in java proto params.""
Ulas Kirazci [Thu, 25 Jul 2013 20:31:44 +0000 (20:31 +0000)]
Merge "Revert "Allow proto builds to pass in java proto params.""

11 years agoRevert "Allow proto builds to pass in java proto params."
Ulas Kirazci [Thu, 25 Jul 2013 19:35:28 +0000 (19:35 +0000)]
Revert "Allow proto builds to pass in java proto params."

This reverts commit 28b46fc16c026365378909f1cc88fad0d3b2395c.

Change-Id: Iaca9fa749c6f460911cc46e08e6b3ae2555b8bcc