OSDN Git Service
Dmitriy Ivanov [Wed, 12 Mar 2014 22:57:47 +0000 (22:57 +0000)]
am
abfea0ac: am
7ba6258a: am
d842e6d6: am
c62d6f76: Merge "Add TARGET_2ND_ARCH to dumpvar"
* commit '
abfea0ac92964024996dc487028f1b4896e1bdf0':
Add TARGET_2ND_ARCH to dumpvar
Dmitriy Ivanov [Wed, 12 Mar 2014 18:53:04 +0000 (18:53 +0000)]
am
7ba6258a: am
d842e6d6: am
c62d6f76: Merge "Add TARGET_2ND_ARCH to dumpvar"
* commit '
7ba6258a7b4206c97da2dce6719625cf4cbd5b96':
Add TARGET_2ND_ARCH to dumpvar
Dmitriy Ivanov [Wed, 12 Mar 2014 18:49:19 +0000 (18:49 +0000)]
am
d842e6d6: am
c62d6f76: Merge "Add TARGET_2ND_ARCH to dumpvar"
* commit '
d842e6d6c35fc7b0320e2e9ceb69caa71daf040a':
Add TARGET_2ND_ARCH to dumpvar
Dmitriy Ivanov [Wed, 12 Mar 2014 18:46:05 +0000 (11:46 -0700)]
am
c62d6f76: Merge "Add TARGET_2ND_ARCH to dumpvar"
* commit '
c62d6f7622f567ba9a0acf54a80d118f85e741b4':
Add TARGET_2ND_ARCH to dumpvar
Dmitriy Ivanov [Wed, 12 Mar 2014 18:40:42 +0000 (18:40 +0000)]
Merge "Add TARGET_2ND_ARCH to dumpvar"
Dmitriy Ivanov [Wed, 12 Mar 2014 18:13:41 +0000 (11:13 -0700)]
Add TARGET_2ND_ARCH to dumpvar
Change-Id: Ida87a61cceb55b7ebc28735b4688a03a10c01096
Andrew Hsieh [Wed, 12 Mar 2014 01:49:34 +0000 (01:49 +0000)]
Merge "Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer"
Andy McFadden [Tue, 11 Mar 2014 20:51:12 +0000 (13:51 -0700)]
Remove "screenshot"
Remove the old "screenshot" utility, which has been replaced
by "screencap".
Change-Id: I5bad1fdad308339e4a16ce92f2a65e2437b1be65
Ying Wang [Tue, 11 Mar 2014 02:15:11 +0000 (02:15 +0000)]
am
f91a014f: am
0a196075: am
446f00c9: am
ce156811: Merge "Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG"
* commit '
f91a014f6f2c176f6e1f99cb3bb90d707e0be31c':
Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG
Ying Wang [Tue, 11 Mar 2014 02:11:29 +0000 (02:11 +0000)]
am
0a196075: am
446f00c9: am
ce156811: Merge "Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG"
* commit '
0a196075eeddef89a5cc8b679adde7c0791031bf':
Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG
Ying Wang [Tue, 11 Mar 2014 02:08:45 +0000 (02:08 +0000)]
am
446f00c9: am
ce156811: Merge "Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG"
* commit '
446f00c9e1a8ef2b119617ab63c15a6aa40c733b':
Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG
Ying Wang [Tue, 11 Mar 2014 02:05:27 +0000 (19:05 -0700)]
am
ce156811: Merge "Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG"
* commit '
ce156811797d7594b712120c5d969e329d70b1e3':
Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG
Ying Wang [Tue, 11 Mar 2014 02:03:07 +0000 (02:03 +0000)]
Merge "Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG"
Ying Wang [Tue, 11 Mar 2014 01:23:08 +0000 (18:23 -0700)]
Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG
Still keep WITHOUT_CLANG, which enables both.
Bug:
13402154
Change-Id: I32cb668223997719875751bf3d64f592d6086830
Ian Rogers [Tue, 11 Mar 2014 00:37:50 +0000 (00:37 +0000)]
am
d5cd41fe: am
95739176: am
21060b30: am
775d15e0: Merge "Define __STDC_CONSTANT_MACROS globally to work around host build differences."
* commit '
d5cd41fe6d9d140e84703e87cec1f83660e568e3':
Define __STDC_CONSTANT_MACROS globally to work around host build differences.
Ian Rogers [Tue, 11 Mar 2014 00:04:52 +0000 (00:04 +0000)]
am
95739176: am
21060b30: am
775d15e0: Merge "Define __STDC_CONSTANT_MACROS globally to work around host build differences."
* commit '
95739176994c3b28fc7fdd3e677de500cdd66b8c':
Define __STDC_CONSTANT_MACROS globally to work around host build differences.
Ian Rogers [Tue, 11 Mar 2014 00:01:57 +0000 (00:01 +0000)]
am
21060b30: am
775d15e0: Merge "Define __STDC_CONSTANT_MACROS globally to work around host build differences."
* commit '
21060b30993b975084ea7a7c35a6df23cf0e5ea7':
Define __STDC_CONSTANT_MACROS globally to work around host build differences.
Ian Rogers [Mon, 10 Mar 2014 23:59:07 +0000 (16:59 -0700)]
am
775d15e0: Merge "Define __STDC_CONSTANT_MACROS globally to work around host build differences."
* commit '
775d15e001d48d72a1b76982b1b5faa1eb37158f':
Define __STDC_CONSTANT_MACROS globally to work around host build differences.
Ian Rogers [Mon, 10 Mar 2014 23:55:32 +0000 (23:55 +0000)]
Merge "Define __STDC_CONSTANT_MACROS globally to work around host build differences."
Ian Rogers [Mon, 10 Mar 2014 23:49:41 +0000 (16:49 -0700)]
Define __STDC_CONSTANT_MACROS globally to work around host build differences.
Change-Id: I945128b3087b28f62467c7123b759e3514027574
Ian Rogers [Mon, 10 Mar 2014 23:42:20 +0000 (23:42 +0000)]
am
17536801: am
e25c0b25: am
bc39fd5c: am
f1e697be: Merge "Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences.""
* commit '
17536801ea179360da3ba2886dfc48dda392d28a':
Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."
Ian Rogers [Mon, 10 Mar 2014 23:39:12 +0000 (23:39 +0000)]
am
e25c0b25: am
bc39fd5c: am
f1e697be: Merge "Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences.""
* commit '
e25c0b259917b31bfe642b6e4aa08de06068db7a':
Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."
Ian Rogers [Mon, 10 Mar 2014 23:37:13 +0000 (23:37 +0000)]
am
bc39fd5c: am
f1e697be: Merge "Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences.""
* commit '
bc39fd5cab47388797ee7638920766e91fe0b100':
Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."
Ian Rogers [Mon, 10 Mar 2014 23:33:44 +0000 (16:33 -0700)]
am
f1e697be: Merge "Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences.""
* commit '
f1e697be5e433818071a817af0b673cba8e87795':
Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."
Ian Rogers [Mon, 10 Mar 2014 23:29:25 +0000 (23:29 +0000)]
Merge "Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences.""
Ian Rogers [Mon, 10 Mar 2014 23:27:01 +0000 (23:27 +0000)]
Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."
This reverts commit
668427c941bd88cacdf24d0562e6b68eb93038a1.
Change-Id: I3694aad84e7499e4c6839db0bd06acf5166e4802
Ian Rogers [Mon, 10 Mar 2014 22:58:18 +0000 (22:58 +0000)]
am
4d16757b: am
848361f9: am
a520bfbe: am
4783dc7a: Merge "Define __STDC_LIMIT_MACROS globally to work around host build differences."
* commit '
4d16757b201003cd25b0b27a717b1bc7c32a6dd8':
Define __STDC_LIMIT_MACROS globally to work around host build differences.
Ian Rogers [Mon, 10 Mar 2014 22:54:53 +0000 (22:54 +0000)]
am
848361f9: am
a520bfbe: am
4783dc7a: Merge "Define __STDC_LIMIT_MACROS globally to work around host build differences."
* commit '
848361f97e84aa5ef6a05fc38126734fb5728e84':
Define __STDC_LIMIT_MACROS globally to work around host build differences.
Ian Rogers [Mon, 10 Mar 2014 22:51:08 +0000 (22:51 +0000)]
am
a520bfbe: am
4783dc7a: Merge "Define __STDC_LIMIT_MACROS globally to work around host build differences."
* commit '
a520bfbeb65b307da42abb079911311096fef20c':
Define __STDC_LIMIT_MACROS globally to work around host build differences.
Ian Rogers [Mon, 10 Mar 2014 22:48:25 +0000 (15:48 -0700)]
am
4783dc7a: Merge "Define __STDC_LIMIT_MACROS globally to work around host build differences."
* commit '
4783dc7ab509b7099d2de83f863a9799ce67659e':
Define __STDC_LIMIT_MACROS globally to work around host build differences.
Ian Rogers [Mon, 10 Mar 2014 22:44:49 +0000 (22:44 +0000)]
Merge "Define __STDC_LIMIT_MACROS globally to work around host build differences."
Ian Rogers [Mon, 10 Mar 2014 22:30:39 +0000 (15:30 -0700)]
Define __STDC_LIMIT_MACROS globally to work around host build differences.
Change-Id: I571fc5a4b35c830ca8de4dc3117aef258dffa1bd
Ying Wang [Mon, 10 Mar 2014 19:34:33 +0000 (19:34 +0000)]
am
1409fb95: am
76704158: am
61cf1df7: am
60ef9d5b: Merge "jdk error message should not mention the version"
* commit '
1409fb9511dab926d358a7a6d850981bb53f366f':
jdk error message should not mention the version
Ying Wang [Mon, 10 Mar 2014 19:31:28 +0000 (19:31 +0000)]
am
76704158: am
61cf1df7: am
60ef9d5b: Merge "jdk error message should not mention the version"
* commit '
7670415852747814f0a6b3480bf9a499c1fd5e75':
jdk error message should not mention the version
Ying Wang [Mon, 10 Mar 2014 19:29:36 +0000 (19:29 +0000)]
am
61cf1df7: am
60ef9d5b: Merge "jdk error message should not mention the version"
* commit '
61cf1df7edbb9d52a6f151b011633b2859213c35':
jdk error message should not mention the version
Ying Wang [Mon, 10 Mar 2014 19:28:03 +0000 (12:28 -0700)]
am
60ef9d5b: Merge "jdk error message should not mention the version"
* commit '
60ef9d5b263bdc6799bb6495bdd34877647d07fe':
jdk error message should not mention the version
Ying Wang [Mon, 10 Mar 2014 19:25:58 +0000 (19:25 +0000)]
Merge "jdk error message should not mention the version"
Chris Wren [Fri, 7 Mar 2014 19:51:56 +0000 (14:51 -0500)]
jdk error message should not mention the version
the version is checked elsewhere
Bug:
13362810
Change-Id: I91e322780d8422ae78b9a4dc8ee008b99f860404
Clay Murphy [Mon, 10 Mar 2014 18:59:17 +0000 (18:59 +0000)]
am
e07f513b: am
04a68914: am
25f47659: am
05192e5a: Merge "Docs: replacing analytics ID from D.A.C. Bug:
11476435"
* commit '
e07f513b1dffba14d668bd2f17c2442d2b13d99c':
Docs: replacing analytics ID from D.A.C. Bug:
11476435
Clay Murphy [Mon, 10 Mar 2014 18:57:10 +0000 (18:57 +0000)]
am
04a68914: am
25f47659: am
05192e5a: Merge "Docs: replacing analytics ID from D.A.C. Bug:
11476435"
* commit '
04a689140be58fa8308ea0f7e641319f55407c8f':
Docs: replacing analytics ID from D.A.C. Bug:
11476435
Clay Murphy [Mon, 10 Mar 2014 18:55:24 +0000 (18:55 +0000)]
am
25f47659: am
05192e5a: Merge "Docs: replacing analytics ID from D.A.C. Bug:
11476435"
* commit '
25f47659d7cc0e7b9d65ab8ce070fc7b00c4976c':
Docs: replacing analytics ID from D.A.C. Bug:
11476435
Clay Murphy [Mon, 10 Mar 2014 18:52:21 +0000 (11:52 -0700)]
am
05192e5a: Merge "Docs: replacing analytics ID from D.A.C. Bug:
11476435"
* commit '
05192e5a9095ac6a89757157dfd3636a2f56df7f':
Docs: replacing analytics ID from D.A.C. Bug:
11476435
Clay Murphy [Mon, 10 Mar 2014 18:47:17 +0000 (18:47 +0000)]
Merge "Docs: replacing analytics ID from D.A.C. Bug:
11476435"
Adam Hampson [Sat, 8 Mar 2014 05:45:32 +0000 (05:45 +0000)]
am
0dfd6681: am
deb46244: am
57afaa53: Add init.environ.rc to installclean
* commit '
0dfd668138b8b9448fcec818d29df5b37f06be96':
Add init.environ.rc to installclean
Adam Hampson [Sat, 8 Mar 2014 02:00:19 +0000 (02:00 +0000)]
am
deb46244: am
57afaa53: Add init.environ.rc to installclean
* commit '
deb462442f8b1716f25988f18855a323c88bc6fb':
Add init.environ.rc to installclean
Adam Hampson [Sat, 8 Mar 2014 01:54:46 +0000 (01:54 +0000)]
am
57afaa53: Add init.environ.rc to installclean
* commit '
57afaa537361e7f5c12c049b13b831c1126b3cad':
Add init.environ.rc to installclean
Adam Hampson [Fri, 7 Mar 2014 23:53:44 +0000 (15:53 -0800)]
Add init.environ.rc to installclean
BOOTCLASSPATH needs to be rebuilt when switching between build
targets.
Bug:
13282187
Change-Id: I16816abb4246878a60e1aa8c91b6b38c7339950e
Signed-off-by: Adam Hampson <ahampson@google.com>
Chris Wren [Fri, 7 Mar 2014 20:45:56 +0000 (20:45 +0000)]
Merge "jdk error message should not mention the version"
Ben Cheng [Fri, 7 Mar 2014 20:33:22 +0000 (20:33 +0000)]
am
585fa32d: am
395ae92a: am
21ef9705: am
f230bcf4: Merge "OProfile is no longer compiled now."
* commit '
585fa32d7ee6bbe40b4aae130e6b0ceb711596fe':
OProfile is no longer compiled now.
Chris Wren [Fri, 7 Mar 2014 19:51:56 +0000 (14:51 -0500)]
jdk error message should not mention the version
the version is checked elsewhere
Bug:
13362810
Change-Id: I91e322780d8422ae78b9a4dc8ee008b99f860404
Ben Cheng [Fri, 7 Mar 2014 16:58:43 +0000 (16:58 +0000)]
am
395ae92a: am
21ef9705: am
f230bcf4: Merge "OProfile is no longer compiled now."
* commit '
395ae92afbe1f8e874499023996162cb7cbb9ac8':
OProfile is no longer compiled now.
Ben Cheng [Fri, 7 Mar 2014 16:55:52 +0000 (16:55 +0000)]
am
21ef9705: am
f230bcf4: Merge "OProfile is no longer compiled now."
* commit '
21ef9705b67bc8c2666a30bf71db0ba5125c93f2':
OProfile is no longer compiled now.
Ben Cheng [Fri, 7 Mar 2014 16:52:52 +0000 (08:52 -0800)]
am
f230bcf4: Merge "OProfile is no longer compiled now."
* commit '
f230bcf4035bdbc98e64c769b192c0d33b483913':
OProfile is no longer compiled now.
Ben Cheng [Fri, 7 Mar 2014 16:49:39 +0000 (16:49 +0000)]
Merge "OProfile is no longer compiled now."
Doug Zongker [Thu, 6 Mar 2014 16:39:19 +0000 (16:39 +0000)]
Merge "test block system image patch at build time"
Ben Cheng [Wed, 5 Mar 2014 22:31:34 +0000 (14:31 -0800)]
OProfile is no longer compiled now.
BUG:
13249790
Change-Id: I2d4fd8f888823687ea41ddbee1f7ce2a7ebc99f7
Dianne Hackborn [Wed, 5 Mar 2014 20:55:40 +0000 (20:55 +0000)]
Merge "It's L, dagnabbit."
Dianne Hackborn [Wed, 5 Mar 2014 20:33:44 +0000 (12:33 -0800)]
It's L, dagnabbit.
Change-Id: Ied4e6fce1464aa5cd012a5e2519df8462ec91b4c
Clay Murphy [Wed, 6 Nov 2013 22:03:41 +0000 (14:03 -0800)]
Docs: replacing analytics ID from D.A.C.
Bug:
11476435
Change-Id: I834646e6a618709fe21afa5958bd28f822991e29
Nicolas Geoffray [Wed, 5 Mar 2014 18:11:02 +0000 (18:11 +0000)]
am
769a191f: am
50fcf753: am
db48d145: am
247dd0c4: Merge "Do not remove the generated .hpp file from yacc."
* commit '
769a191fd6423bbe36d6eef513be1aafa734a10f':
Do not remove the generated .hpp file from yacc.
Nicolas Geoffray [Wed, 5 Mar 2014 18:08:03 +0000 (18:08 +0000)]
am
50fcf753: am
db48d145: am
247dd0c4: Merge "Do not remove the generated .hpp file from yacc."
* commit '
50fcf753081a73ab808ccf1933959d671ca1a68b':
Do not remove the generated .hpp file from yacc.
Nicolas Geoffray [Wed, 5 Mar 2014 18:04:30 +0000 (18:04 +0000)]
am
db48d145: am
247dd0c4: Merge "Do not remove the generated .hpp file from yacc."
* commit '
db48d145841afb9b9b6d1c124191a1681d6b4f39':
Do not remove the generated .hpp file from yacc.
Nicolas Geoffray [Wed, 5 Mar 2014 18:02:02 +0000 (10:02 -0800)]
am
247dd0c4: Merge "Do not remove the generated .hpp file from yacc."
* commit '
247dd0c4af33fc7d3ebcfc058837e131e5185546':
Do not remove the generated .hpp file from yacc.
Nicolas Geoffray [Wed, 5 Mar 2014 14:09:26 +0000 (14:09 +0000)]
Merge "Do not remove the generated .hpp file from yacc."
Doug Zongker [Tue, 4 Mar 2014 21:17:11 +0000 (21:17 +0000)]
Merge "move data wipe to end of OTA package"
Doug Zongker [Tue, 4 Mar 2014 21:16:24 +0000 (13:16 -0800)]
move data wipe to end of OTA package
Now that OTA packages can be downloaded to /data, if they include a
data wipe we should do that last.
Change-Id: I75102fb2ff85d0f0110d55dfca06ec5f38104850
Doug Zongker [Tue, 4 Mar 2014 18:03:02 +0000 (10:03 -0800)]
test block system image patch at build time
After building a patch for the system image (for incremental block
OTAs), apply it to a local copy of the file and test that it succeeds.
This is an imperfect test as it's using the local client's
syspatch_host, which may differ from the syspatch library actually
used in the target build, but it's somewhat better than nothing.
Change-Id: Ic0001b0145881e2ebd4b5b36ce9b5bcebd76deb4
Nicolas Geoffray [Tue, 4 Mar 2014 17:56:01 +0000 (17:56 +0000)]
am
22130e8f: am
3f5cc08d: am
b11697d3: am
68d38154: Merge "Remove host-prefix command line argument to dex2oat."
* commit '
22130e8f3b28a44fec5abe51cb9fae4e19245c94':
Remove host-prefix command line argument to dex2oat.
Nicolas Geoffray [Tue, 4 Mar 2014 17:28:51 +0000 (17:28 +0000)]
am
3f5cc08d: am
b11697d3: am
68d38154: Merge "Remove host-prefix command line argument to dex2oat."
* commit '
3f5cc08d468c62e3b937f570d93836591783d3dd':
Remove host-prefix command line argument to dex2oat.
Nicolas Geoffray [Tue, 4 Mar 2014 17:24:44 +0000 (17:24 +0000)]
am
b11697d3: am
68d38154: Merge "Remove host-prefix command line argument to dex2oat."
* commit '
b11697d30778db51d476aedd28b0e2c65eb241e3':
Remove host-prefix command line argument to dex2oat.
Nicolas Geoffray [Tue, 4 Mar 2014 17:22:47 +0000 (09:22 -0800)]
am
68d38154: Merge "Remove host-prefix command line argument to dex2oat."
* commit '
68d381540f822849f3bcd7620f773aa9ba004900':
Remove host-prefix command line argument to dex2oat.
Nicolas Geoffray [Tue, 4 Mar 2014 17:20:36 +0000 (17:20 +0000)]
Merge "Remove host-prefix command line argument to dex2oat."
Nicolas Geoffray [Tue, 4 Mar 2014 17:06:40 +0000 (17:06 +0000)]
Remove host-prefix command line argument to dex2oat.
Change-Id: If4a962976d1e8a283d6b682112a1b12d328d8dbb
Doug Zongker [Tue, 4 Mar 2014 16:53:36 +0000 (16:53 +0000)]
Merge "handle don't care regions in the system image"
Nicolas Geoffray [Tue, 4 Mar 2014 14:48:55 +0000 (14:48 +0000)]
Do not remove the generated .hpp file from yacc.
Depending on the file extension of the generated C++ file,
bison will generate a #include of a .h or .hpp. So both files
must be kept in the generated directory.
Change-Id: Id0aac7f407bdc69c7f5012c0d021761b0fceb427
Andrew Hsieh [Tue, 4 Mar 2014 01:19:10 +0000 (01:19 +0000)]
am
887a76fa: am
1537f8bf: am
12493c89: am
6808c260: Merge "Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer"
* commit '
887a76fa476d25cb0e8297e3511042ddf8209877':
Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer
Andrew Hsieh [Tue, 4 Mar 2014 01:16:54 +0000 (01:16 +0000)]
am
1537f8bf: am
12493c89: am
6808c260: Merge "Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer"
* commit '
1537f8bfde6b25d8eeb97c519f9c01fcc3e724f0':
Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer
Andrew Hsieh [Tue, 4 Mar 2014 01:12:03 +0000 (01:12 +0000)]
am
12493c89: am
6808c260: Merge "Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer"
* commit '
12493c892e59d826eec41caea6bc90a5778bb672':
Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer
Andrew Hsieh [Tue, 4 Mar 2014 01:09:18 +0000 (17:09 -0800)]
am
6808c260: Merge "Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer"
* commit '
6808c2608f0eff3275110154d7267f934700c167':
Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer
Andrew Hsieh [Tue, 4 Mar 2014 01:06:04 +0000 (01:06 +0000)]
Merge "Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer"
Victoria Lease [Mon, 3 Mar 2014 23:49:36 +0000 (23:49 +0000)]
am
3c14d21a: am
14a5be01: am
4e965ac6: am
38626e63: Merge "Add external/google-fonts/*/fonts.mk."
* commit '
3c14d21a2a62398322479e015fecdb43652fb331':
Add external/google-fonts/*/fonts.mk.
Victoria Lease [Mon, 3 Mar 2014 23:47:04 +0000 (23:47 +0000)]
am
14a5be01: am
4e965ac6: am
38626e63: Merge "Add external/google-fonts/*/fonts.mk."
* commit '
14a5be0174e6d6cf00011bb810b033ec4f7094c0':
Add external/google-fonts/*/fonts.mk.
Victoria Lease [Mon, 3 Mar 2014 23:42:48 +0000 (23:42 +0000)]
am
4e965ac6: am
38626e63: Merge "Add external/google-fonts/*/fonts.mk."
* commit '
4e965ac6f56de2071a381ed37e4a9899062e5ab2':
Add external/google-fonts/*/fonts.mk.
Victoria Lease [Mon, 3 Mar 2014 23:40:42 +0000 (15:40 -0800)]
am
38626e63: Merge "Add external/google-fonts/*/fonts.mk."
* commit '
38626e635771a9e1d5ee8f812ea967d842938052':
Add external/google-fonts/*/fonts.mk.
Victoria Lease [Mon, 3 Mar 2014 23:38:33 +0000 (23:38 +0000)]
Merge "Add external/google-fonts/*/fonts.mk."
Doug Zongker [Mon, 24 Feb 2014 16:13:45 +0000 (08:13 -0800)]
handle don't care regions in the system image
The system partitions has regions that we shouldn't write and can't
depend on the contents of. Adds a new script to generate a map of
these regions (using the sparse image as input), and include the map
in the package zip so it can be used when writing or patching the
system partition.
Also fixes a bug where the wrong SELinux file contexts are used when
generating incrementals.
Change-Id: Iaca5b967a3b7d1df843c7c21becc19b3f1633dad
Doug Zongker [Mon, 3 Mar 2014 18:56:50 +0000 (18:56 +0000)]
Merge "add option to specify updater binary, for development"
Colin Cross [Mon, 3 Mar 2014 18:51:16 +0000 (18:51 +0000)]
am
50c868c0: am
a8654410: Remove idmap from 64-bit blacklist
* commit '
50c868c0af886bdb6c624aedefd4d758482583e3':
Remove idmap from 64-bit blacklist
Colin Cross [Mon, 3 Mar 2014 18:49:11 +0000 (18:49 +0000)]
am
a8654410: Remove idmap from 64-bit blacklist
* commit '
a86544106f214c4d0461975d32578b09f7652f6b':
Remove idmap from 64-bit blacklist
Colin Cross [Mon, 3 Mar 2014 18:32:09 +0000 (10:32 -0800)]
Remove idmap from 64-bit blacklist
frameworks/native/cmds/idmap was accidentally added to the blacklist
in a bad merge in commit
a0eb50accabe83b18bd3fe3b9d6417a4718af9e2.
Change-Id: I545d401a934f1183e03235d5abe5ab15563a4e6d
Doug Zongker [Mon, 3 Mar 2014 18:21:27 +0000 (10:21 -0800)]
add option to specify updater binary, for development
Change-Id: I5f239afff70c87fb16ddc4b8abefa7bbcda6040d
Nicolas Geoffray [Mon, 3 Mar 2014 18:15:22 +0000 (18:15 +0000)]
am
77d4e8ed: am
2801735a: am
d85ef325: am
460ed38a: Merge "Extend YACC and LEX handling to .yy and .ll files."
* commit '
77d4e8ed4456c0d033d0740881f0843f00893248':
Extend YACC and LEX handling to .yy and .ll files.
Nicolas Geoffray [Mon, 3 Mar 2014 18:11:47 +0000 (18:11 +0000)]
am
2801735a: am
d85ef325: am
460ed38a: Merge "Extend YACC and LEX handling to .yy and .ll files."
* commit '
2801735ab128a7e5497330d33b44a2707465fa4e':
Extend YACC and LEX handling to .yy and .ll files.
Nicolas Geoffray [Mon, 3 Mar 2014 18:08:45 +0000 (18:08 +0000)]
am
d85ef325: am
460ed38a: Merge "Extend YACC and LEX handling to .yy and .ll files."
* commit '
d85ef325de805996050170b3ce1cc199cba7c980':
Extend YACC and LEX handling to .yy and .ll files.
Nicolas Geoffray [Mon, 3 Mar 2014 18:05:57 +0000 (10:05 -0800)]
am
460ed38a: Merge "Extend YACC and LEX handling to .yy and .ll files."
* commit '
460ed38aa977fd9c4318ba8e67e65805cddad6bb':
Extend YACC and LEX handling to .yy and .ll files.
Nicolas Geoffray [Mon, 3 Mar 2014 18:03:29 +0000 (18:03 +0000)]
Merge "Extend YACC and LEX handling to .yy and .ll files."
Primiano Tucci [Mon, 3 Mar 2014 18:02:44 +0000 (18:02 +0000)]
am
573eb55d: am
29447fa7: am
ff157c76: am
368faf83: Merge "Add usage comment to explain how to limit modules in mmm."
* commit '
573eb55db562854d66426706b1e6e34b4d15fb77':
Add usage comment to explain how to limit modules in mmm.
Primiano Tucci [Mon, 3 Mar 2014 17:59:28 +0000 (17:59 +0000)]
am
29447fa7: am
ff157c76: am
368faf83: Merge "Add usage comment to explain how to limit modules in mmm."
* commit '
29447fa71b089de227a6a8241d53f65b91024231':
Add usage comment to explain how to limit modules in mmm.
Primiano Tucci [Mon, 3 Mar 2014 17:56:31 +0000 (17:56 +0000)]
am
ff157c76: am
368faf83: Merge "Add usage comment to explain how to limit modules in mmm."
* commit '
ff157c76c9d7d524236e7bfc3ef7cab53dd91818':
Add usage comment to explain how to limit modules in mmm.
Primiano Tucci [Mon, 3 Mar 2014 17:52:47 +0000 (09:52 -0800)]
am
368faf83: Merge "Add usage comment to explain how to limit modules in mmm."
* commit '
368faf835b45647bd1961a3a2321daa45ad31568':
Add usage comment to explain how to limit modules in mmm.