OSDN Git Service
Colin Cross [Sun, 16 Mar 2014 00:06:17 +0000 (00:06 +0000)]
am
c48da22b: am
8213b719: am
6e92ade0: am
db24577b: Merge "Work in progress to enable build system support for Clang."
* commit '
c48da22b6d0f7be0b9ce9f1d448fc524e692e86c':
Work in progress to enable build system support for Clang.
Colin Cross [Sun, 16 Mar 2014 00:02:44 +0000 (00:02 +0000)]
am
8213b719: am
6e92ade0: am
db24577b: Merge "Work in progress to enable build system support for Clang."
* commit '
8213b719c8e5e4f757a4898213eb624622c11526':
Work in progress to enable build system support for Clang.
Colin Cross [Sat, 15 Mar 2014 23:59:32 +0000 (23:59 +0000)]
am
6e92ade0: am
db24577b: Merge "Work in progress to enable build system support for Clang."
* commit '
6e92ade0a6cd8aea8f074fdc44f375ef2f1d50b7':
Work in progress to enable build system support for Clang.
Colin Cross [Sat, 15 Mar 2014 23:56:40 +0000 (16:56 -0700)]
am
db24577b: Merge "Work in progress to enable build system support for Clang."
* commit '
db24577bbd0ccc60be19791290d367e2efb5583e':
Work in progress to enable build system support for Clang.
Colin Cross [Sat, 15 Mar 2014 23:54:03 +0000 (23:54 +0000)]
Merge "Work in progress to enable build system support for Clang."
Andrew Hsieh [Fri, 14 Mar 2014 17:13:11 +0000 (17:13 +0000)]
am
70dff286: am
228f8afc: am
de8edc8a: am
933e8940: Merge "Fix HOST_TOOLCHAIN_PREFIX"
* commit '
70dff2866fd7a22a7248a80fd888d167c0f7636a':
Fix HOST_TOOLCHAIN_PREFIX
Tim Murray [Fri, 7 Mar 2014 21:18:44 +0000 (13:18 -0800)]
Work in progress to enable build system support for Clang.
Change-Id: I278b48bcd976afcbde8d86261da9b9b9efc9002c
Andrew Hsieh [Fri, 14 Mar 2014 00:31:45 +0000 (00:31 +0000)]
am
228f8afc: am
de8edc8a: am
933e8940: Merge "Fix HOST_TOOLCHAIN_PREFIX"
* commit '
228f8afc4d7f95314fe76335e819d176b331e041':
Fix HOST_TOOLCHAIN_PREFIX
Andrew Hsieh [Fri, 14 Mar 2014 00:26:55 +0000 (00:26 +0000)]
am
de8edc8a: am
933e8940: Merge "Fix HOST_TOOLCHAIN_PREFIX"
* commit '
de8edc8a35e5a53c6f1f8e5db099c28691319585':
Fix HOST_TOOLCHAIN_PREFIX
Andrew Hsieh [Fri, 14 Mar 2014 00:23:37 +0000 (17:23 -0700)]
am
933e8940: Merge "Fix HOST_TOOLCHAIN_PREFIX"
* commit '
933e8940d00745413ae1e9d0e76714feecf9086a':
Fix HOST_TOOLCHAIN_PREFIX
Andrew Hsieh [Fri, 14 Mar 2014 00:19:18 +0000 (00:19 +0000)]
Merge "Fix HOST_TOOLCHAIN_PREFIX"
Hui Shu [Thu, 13 Mar 2014 23:35:42 +0000 (23:35 +0000)]
Merge "Fix another build break."
Hui Shu [Thu, 13 Mar 2014 23:21:08 +0000 (16:21 -0700)]
Fix another build break.
The doclava build does not need to depend on the intermedidate
removed.txt. It depends on public_api.txt. Removed.txt is generated
along with public_api.txt by doclava.
BUG: b/
11293324
Change-Id: Ia5ea675bbfb15b81ce6ae81cf34c608e83676ca1
Narayan Kamath [Thu, 13 Mar 2014 23:11:49 +0000 (23:11 +0000)]
am
2c852c33: am
f262d87f: am
237f5414: am
cc8d6dab: Merge "Revert "Remove external/chromium from the 64 bit blacklist.""
* commit '
2c852c3399d86ae2f25fe4205d8e4bd4a3ce971f':
Revert "Remove external/chromium from the 64 bit blacklist."
Hui Shu [Thu, 13 Mar 2014 22:38:29 +0000 (15:38 -0700)]
Fix the build break.
BUG: b/
11293324
Should find the removed.txt under frameworks/base/api/
Change-Id: Icd937cb8c1a7f23dba35c440045cea54e2a8242e
Hui Shu [Thu, 13 Mar 2014 22:11:22 +0000 (22:11 +0000)]
Merge "Add removed.txt for doclava api consistency check"
Narayan Kamath [Thu, 13 Mar 2014 21:20:36 +0000 (21:20 +0000)]
am
e00d0e7c: am
f6869e25: am
70916972: am
25249624: Merge "Remove external/chromium from the 64 bit blacklist."
* commit '
e00d0e7c6a5b63489faa3e8e9de6285b11f7b8e9':
Remove external/chromium from the 64 bit blacklist.
Narayan Kamath [Thu, 13 Mar 2014 09:40:11 +0000 (09:40 +0000)]
am
f262d87f: am
237f5414: am
cc8d6dab: Merge "Revert "Remove external/chromium from the 64 bit blacklist.""
* commit '
f262d87f0163222fbdb0cb99cd21f4646d2c6f4f':
Revert "Remove external/chromium from the 64 bit blacklist."
Narayan Kamath [Thu, 13 Mar 2014 09:33:58 +0000 (09:33 +0000)]
am
237f5414: am
cc8d6dab: Merge "Revert "Remove external/chromium from the 64 bit blacklist.""
* commit '
237f5414ebf38e1386307679947641f72865fc38':
Revert "Remove external/chromium from the 64 bit blacklist."
Narayan Kamath [Thu, 13 Mar 2014 09:31:33 +0000 (02:31 -0700)]
am
cc8d6dab: Merge "Revert "Remove external/chromium from the 64 bit blacklist.""
* commit '
cc8d6dab9a3ae140ed99d3f3373e72b54811f210':
Revert "Remove external/chromium from the 64 bit blacklist."
Narayan Kamath [Thu, 13 Mar 2014 09:29:52 +0000 (09:29 +0000)]
Merge "Revert "Remove external/chromium from the 64 bit blacklist.""
Narayan Kamath [Thu, 13 Mar 2014 09:29:22 +0000 (09:29 +0000)]
Revert "Remove external/chromium from the 64 bit blacklist."
This reverts commit
27bf51144af3513605cff421beb39a556599eb42.
Change-Id: Ic7e4fff8f87342a248172c2fc0d1358b4db1c25c
Narayan Kamath [Thu, 13 Mar 2014 09:28:33 +0000 (09:28 +0000)]
am
f6869e25: am
70916972: am
25249624: Merge "Remove external/chromium from the 64 bit blacklist."
* commit '
f6869e25c9117d20a9a1f315d5784068e4d7ea99':
Remove external/chromium from the 64 bit blacklist.
Narayan Kamath [Thu, 13 Mar 2014 09:18:00 +0000 (09:18 +0000)]
am
70916972: am
25249624: Merge "Remove external/chromium from the 64 bit blacklist."
* commit '
709169725a34836b3f388526aee714f070f20103':
Remove external/chromium from the 64 bit blacklist.
Narayan Kamath [Thu, 13 Mar 2014 09:08:35 +0000 (02:08 -0700)]
am
25249624: Merge "Remove external/chromium from the 64 bit blacklist."
* commit '
252496247f31ee06d8c948886fd2f3a36ccd021e':
Remove external/chromium from the 64 bit blacklist.
Narayan Kamath [Thu, 13 Mar 2014 09:05:30 +0000 (09:05 +0000)]
Merge "Remove external/chromium from the 64 bit blacklist."
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
Narayan Kamath [Wed, 12 Mar 2014 14:42:07 +0000 (14:42 +0000)]
Remove external/chromium from the 64 bit blacklist.
This isn't the same as chromium_org (which is used by the
webview). This is a 3 year old snapshot of the net stack which
compiles under 64 bit. It's currently used on aosp master by
libstagefright_chromium_http.
This project can be removed if the changes that remove the
chromium dependency are cherry-picked to aosp/master.
Change-Id: I5d0f9ed03ea9842b47d980d77ea32bc7a3f6998f
Andrew Hsieh [Wed, 12 Mar 2014 11:27:59 +0000 (19:27 +0800)]
Fix HOST_TOOLCHAIN_PREFIX
Previously HOST_TOOLCHAIN_PREFIX can't accept toolchain in arch-os-*-gcc
format. Fix it so we can try out new host toolchain, eg.
HOST_TOOLCHAIN_PREFIX=prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6/bin/x86_64-linux- make
Change-Id: Ic1092593036c41d5471e788654fb4e0991dd7e40
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."