Ying Wang
7670415852
am 61cf1df7: am 60ef9d5b: Merge "jdk error message should not mention the version"
...
* commit '61cf1df7edbb9d52a6f151b011633b2859213c35':
jdk error message should not mention the version
2014-03-10 19:29:36 +00:00
Ying Wang
61cf1df7ed
am 60ef9d5b: Merge "jdk error message should not mention the version"
...
* commit '60ef9d5b263bdc6799bb6495bdd34877647d07fe':
jdk error message should not mention the version
2014-03-10 12:28:03 -07:00
Ying Wang
60ef9d5b26
Merge "jdk error message should not mention the version"
2014-03-10 19:25:59 +00:00
Chris Wren
22e3835e33
jdk error message should not mention the version
...
the version is checked elsewhere
Bug: 13362810
Change-Id: I91e322780d8422ae78b9a4dc8ee008b99f860404
2014-03-10 12:25:31 -07:00
Clay Murphy
7507d03f81
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
2014-03-10 18:59:17 +00:00
Clay Murphy
e07f513b1d
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
2014-03-10 18:57:10 +00:00
Clay Murphy
04a689140b
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
2014-03-10 18:55:24 +00:00
Clay Murphy
25f47659d7
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
2014-03-10 11:52:21 -07:00
Clay Murphy
05192e5a90
Merge "Docs: replacing analytics ID from D.A.C. Bug: 11476435"
2014-03-10 18:47:17 +00:00
Adam Hampson
c723626e23
am 0dfd6681: am deb46244: am 57afaa53: Add init.environ.rc to installclean
...
* commit '0dfd668138b8b9448fcec818d29df5b37f06be96':
Add init.environ.rc to installclean
2014-03-08 05:45:32 +00:00
Adam Hampson
0dfd668138
am deb46244: am 57afaa53: Add init.environ.rc to installclean
...
* commit 'deb462442f8b1716f25988f18855a323c88bc6fb':
Add init.environ.rc to installclean
2014-03-08 02:00:19 +00:00
Adam Hampson
deb462442f
am 57afaa53: Add init.environ.rc to installclean
...
* commit '57afaa537361e7f5c12c049b13b831c1126b3cad':
Add init.environ.rc to installclean
2014-03-08 01:54:46 +00:00
Adam Hampson
57afaa5373
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>
2014-03-07 15:55:18 -08:00
Chris Wren
d30905cab0
Merge "jdk error message should not mention the version"
2014-03-07 20:45:56 +00:00
Ben Cheng
45df929d07
am 585fa32d: am 395ae92a: am 21ef9705: am f230bcf4: Merge "OProfile is no longer compiled now."
...
* commit '585fa32d7ee6bbe40b4aae130e6b0ceb711596fe':
OProfile is no longer compiled now.
2014-03-07 20:33:22 +00:00
Chris Wren
1f11575b7c
jdk error message should not mention the version
...
the version is checked elsewhere
Bug: 13362810
Change-Id: I91e322780d8422ae78b9a4dc8ee008b99f860404
2014-03-07 15:21:08 -05:00
Ben Cheng
585fa32d7e
am 395ae92a: am 21ef9705: am f230bcf4: Merge "OProfile is no longer compiled now."
...
* commit '395ae92afbe1f8e874499023996162cb7cbb9ac8':
OProfile is no longer compiled now.
2014-03-07 16:58:43 +00:00
Ben Cheng
395ae92afb
am 21ef9705: am f230bcf4: Merge "OProfile is no longer compiled now."
...
* commit '21ef9705b67bc8c2666a30bf71db0ba5125c93f2':
OProfile is no longer compiled now.
2014-03-07 16:55:52 +00:00
Ben Cheng
21ef9705b6
am f230bcf4: Merge "OProfile is no longer compiled now."
...
* commit 'f230bcf4035bdbc98e64c769b192c0d33b483913':
OProfile is no longer compiled now.
2014-03-07 08:52:52 -08:00
Ben Cheng
f230bcf403
Merge "OProfile is no longer compiled now."
2014-03-07 16:49:40 +00:00
Doug Zongker
2a99239920
Merge "test block system image patch at build time"
2014-03-06 16:39:20 +00:00
Ben Cheng
d8ce7d8fd6
OProfile is no longer compiled now.
...
BUG: 13249790
Change-Id: I2d4fd8f888823687ea41ddbee1f7ce2a7ebc99f7
2014-03-05 16:59:41 -08:00
Dianne Hackborn
a3be3d8a87
Merge "It's L, dagnabbit."
2014-03-05 20:55:41 +00:00
Dianne Hackborn
56dab18617
It's L, dagnabbit.
...
Change-Id: Ied4e6fce1464aa5cd012a5e2519df8462ec91b4c
2014-03-05 12:33:44 -08:00
Clay Murphy
231f3d03ae
Docs: replacing analytics ID from D.A.C.
...
Bug: 11476435
Change-Id: I834646e6a618709fe21afa5958bd28f822991e29
2014-03-05 12:20:46 -08:00
Nicolas Geoffray
a6edb7a0e1
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.
2014-03-05 18:11:02 +00:00
Nicolas Geoffray
769a191fd6
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.
2014-03-05 18:08:03 +00:00
Nicolas Geoffray
50fcf75308
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.
2014-03-05 18:04:30 +00:00
Nicolas Geoffray
db48d14584
am 247dd0c4: Merge "Do not remove the generated .hpp file from yacc."
...
* commit '247dd0c4af33fc7d3ebcfc058837e131e5185546':
Do not remove the generated .hpp file from yacc.
2014-03-05 10:02:02 -08:00
Nicolas Geoffray
247dd0c4af
Merge "Do not remove the generated .hpp file from yacc."
2014-03-05 14:09:26 +00:00
Doug Zongker
1b33ff339b
Merge "move data wipe to end of OTA package"
2014-03-04 21:17:11 +00:00
Doug Zongker
922206ec2a
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
2014-03-04 13:16:24 -08:00
Doug Zongker
32b527d6cb
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
2014-03-04 10:03:02 -08:00
Nicolas Geoffray
ce968e663e
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.
2014-03-04 17:56:01 +00:00
Nicolas Geoffray
22130e8f3b
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.
2014-03-04 17:28:51 +00:00
Nicolas Geoffray
3f5cc08d46
am b11697d3: am 68d38154: Merge "Remove host-prefix command line argument to dex2oat."
...
* commit 'b11697d30778db51d476aedd28b0e2c65eb241e3':
Remove host-prefix command line argument to dex2oat.
2014-03-04 17:24:44 +00:00
Nicolas Geoffray
b11697d307
am 68d38154: Merge "Remove host-prefix command line argument to dex2oat."
...
* commit '68d381540f822849f3bcd7620f773aa9ba004900':
Remove host-prefix command line argument to dex2oat.
2014-03-04 09:22:47 -08:00
Nicolas Geoffray
68d381540f
Merge "Remove host-prefix command line argument to dex2oat."
2014-03-04 17:20:36 +00:00
Nicolas Geoffray
5fd9a32c4f
Remove host-prefix command line argument to dex2oat.
...
Change-Id: If4a962976d1e8a283d6b682112a1b12d328d8dbb
2014-03-04 17:06:40 +00:00
Doug Zongker
5c62321ca6
Merge "handle don't care regions in the system image"
2014-03-04 16:53:37 +00:00
Nicolas Geoffray
3cb9ddbdec
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
2014-03-04 14:48:55 +00:00
Andrew Hsieh
dc7e26d27e
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
2014-03-04 01:19:10 +00:00
Andrew Hsieh
887a76fa47
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
2014-03-04 01:16:54 +00:00
Andrew Hsieh
1537f8bfde
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
2014-03-04 01:12:03 +00:00
Andrew Hsieh
12493c892e
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
2014-03-03 17:09:18 -08:00
Andrew Hsieh
6808c2608f
Merge "Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer"
2014-03-04 01:06:04 +00:00
Victoria Lease
c9b7f3d6a1
am 3c14d21a: am 14a5be01: am 4e965ac6: am 38626e63: Merge "Add external/google-fonts/*/fonts.mk."
...
* commit '3c14d21a2a62398322479e015fecdb43652fb331':
Add external/google-fonts/*/fonts.mk.
2014-03-03 23:49:36 +00:00
Victoria Lease
3c14d21a2a
am 14a5be01: am 4e965ac6: am 38626e63: Merge "Add external/google-fonts/*/fonts.mk."
...
* commit '14a5be0174e6d6cf00011bb810b033ec4f7094c0':
Add external/google-fonts/*/fonts.mk.
2014-03-03 23:47:04 +00:00
Victoria Lease
14a5be0174
am 4e965ac6: am 38626e63: Merge "Add external/google-fonts/*/fonts.mk."
...
* commit '4e965ac6f56de2071a381ed37e4a9899062e5ab2':
Add external/google-fonts/*/fonts.mk.
2014-03-03 23:42:48 +00:00
Victoria Lease
4e965ac6f5
am 38626e63: Merge "Add external/google-fonts/*/fonts.mk."
...
* commit '38626e635771a9e1d5ee8f812ea967d842938052':
Add external/google-fonts/*/fonts.mk.
2014-03-03 15:40:42 -08:00