Kenny Root
14567bb007
am 08d56b4a: Merge "CTS: work around ClassLoader limitation"
...
* commit '08d56b4a1049fe4b4d3a01e2087f371fdeefaf84':
CTS: work around ClassLoader limitation
2013-02-28 09:47:35 -08:00
Kenny Root
08d56b4a10
Merge "CTS: work around ClassLoader limitation"
2013-02-28 17:23:55 +00:00
Kenny Root
65307c065f
CTS: work around ClassLoader limitation
...
Trying to use reflection on classes loaded from a different ClassLoader
than the system one caused SecurityException since you can't load
certain packages.
Adding them to the boot classpath forces them to be in the same
ClassLoader.
Change-Id: Id518ab0a99da6defac525c0ad430a63f600ce85f
2013-02-27 16:56:04 -08:00
Ian Rogers
e2f7bd46fc
am c148cca6: Merge "Specify -msse3 on host as on target."
...
* commit 'c148cca6611c167115458453c250dd9e81b03dda':
Specify -msse3 on host as on target.
2013-02-27 11:02:42 -08:00
Ian Rogers
c148cca661
Merge "Specify -msse3 on host as on target."
2013-02-27 18:15:50 +00:00
Scott Main
5088211890
am d9876348: am 6fc990df: am c5998412: am f8333457: Revert "docs: move loading of google ref into doc load event to prevent error during load"
...
* commit 'd9876348e1533dbb04779fa4b0b5ccd1b46747fa':
Revert "docs: move loading of google ref into doc load event to prevent error during load"
2013-02-26 18:18:34 -08:00
Scott Main
d9876348e1
am 6fc990df: am c5998412: am f8333457: Revert "docs: move loading of google ref into doc load event to prevent error during load"
...
* commit '6fc990dfe16fb6336457ef0e02a9befd8525082b':
Revert "docs: move loading of google ref into doc load event to prevent error during load"
2013-02-26 18:16:09 -08:00
Scott Main
6fc990dfe1
am c5998412: am f8333457: Revert "docs: move loading of google ref into doc load event to prevent error during load"
...
* commit 'c5998412fda760deacd5a408759f52820735effe':
Revert "docs: move loading of google ref into doc load event to prevent error during load"
2013-02-26 18:14:14 -08:00
Scott Main
c5998412fd
am f8333457: Revert "docs: move loading of google ref into doc load event to prevent error during load"
...
* commit 'f8333457a5ee9abd3d16c9c0abfe0e19e032801f':
Revert "docs: move loading of google ref into doc load event to prevent error during load"
2013-02-26 18:12:22 -08:00
Scott Main
f8333457a5
Revert "docs: move loading of google ref into doc load event to prevent error during load"
...
This reverts commit 578d6446eb
.
2013-02-26 18:10:20 -08:00
Ian Rogers
35a6b4fb65
Specify -msse3 on host as on target.
...
Make the host and the target x86 build more uniform by using the same machine flags.
Its unlikely Android has ever been built on a machine without SSE3 support.
Bug: 8068608
Change-Id: I19635528b61bf2c6faf02c2e575b1d9bf8025d3a
2013-02-26 15:10:22 -08:00
Scott Main
7a68911347
am 0670acc9: am 690dc39c: am 79d08b2c: am 578d6446: docs: move loading of google ref into doc load event to prevent error during load
...
* commit '0670acc9c38b498c2d1f3abb44304d81d42308ca':
docs: move loading of google ref into doc load event to prevent error during load
2013-02-26 14:56:00 -08:00
Scott Main
0670acc9c3
am 690dc39c: am 79d08b2c: am 578d6446: docs: move loading of google ref into doc load event to prevent error during load
...
* commit '690dc39c46604194a4f189841566e8313125e745':
docs: move loading of google ref into doc load event to prevent error during load
2013-02-26 14:54:30 -08:00
Scott Main
690dc39c46
am 79d08b2c: am 578d6446: docs: move loading of google ref into doc load event to prevent error during load
...
* commit '79d08b2cc185c0141ee7ec534b219242c827387f':
docs: move loading of google ref into doc load event to prevent error during load
2013-02-26 14:53:26 -08:00
Scott Main
79d08b2cc1
am 578d6446: docs: move loading of google ref into doc load event to prevent error during load
...
* commit '578d6446eb1714e17a5ccf55a69379f064ec549a':
docs: move loading of google ref into doc load event to prevent error during load
2013-02-26 14:51:06 -08:00
Scott Main
578d6446eb
docs: move loading of google ref into doc load event to prevent error during load
...
Change-Id: Ibe825c25e19f136b2cd58e8a096d13904720e3d2
2013-02-26 14:46:12 -08:00
Jean-Baptiste Queru
bf13b8923b
am 8a0dc8e1: am ee98d0ed: (-s ours) am 53ed93f3: (-s ours) Merge from jb-mr1-dev - do not merge
...
* commit '8a0dc8e13891678151d8e314a0259666835fed43':
2013-02-26 14:30:41 -08:00
Jean-Baptiste Queru
8a0dc8e138
am ee98d0ed: (-s ours) am 53ed93f3: (-s ours) Merge from jb-mr1-dev - do not merge
...
* commit 'ee98d0ed53aeffac2b1d1be2b24bb78f282af0b2':
Drop official SDK 17
JOP40G
2013-02-26 14:29:17 -08:00
Jean-Baptiste Queru
ee98d0ed53
am 53ed93f3: (-s ours) Merge from jb-mr1-dev - do not merge
...
* commit '53ed93f3c47c454f14d1218e4b1b2cfab5308e43':
Drop official SDK 17
JOP40G
2013-02-26 14:28:07 -08:00
Jean-Baptiste Queru
53ed93f3c4
Merge from jb-mr1-dev - do not merge
2013-02-26 14:20:43 -08:00
Jean-Baptiste Queru
22c22cf7e0
Reconcile with jb-mr1-release - do not merge
2013-02-26 14:02:57 -08:00
Scott Main
02f3e81e9e
am fb247b7e: am 386cbaeb: am 9f2971d1: docs: fix suggestions due to file name change for js files
...
* commit 'fb247b7e5c1067038518e52aa62a1cbb54ac6fde':
docs: fix suggestions due to file name change for js files
2013-02-26 13:16:22 -08:00
Scott Main
fb247b7e5c
am 386cbaeb: am 9f2971d1: docs: fix suggestions due to file name change for js files
...
* commit '386cbaeb90fef0ea90695fac8faa407fbffa356a':
docs: fix suggestions due to file name change for js files
2013-02-26 13:13:44 -08:00
Scott Main
386cbaeb90
am 9f2971d1: docs: fix suggestions due to file name change for js files
...
* commit '9f2971d1f36e0bffd79033e946ff1378e6ceb309':
docs: fix suggestions due to file name change for js files
2013-02-26 13:10:04 -08:00
Scott Main
9f2971d1f3
docs: fix suggestions due to file name change for js files
...
Change-Id: I4037c80f79f37f7a80d0977b4e07f992e3de61e1
2013-02-26 13:07:41 -08:00
Scott Main
70887ad43c
am 2e639566: am 8429876f: am 7e447edf: docs: update search suggest with google services apis including some optimizations for loading javascript resources
...
* commit '2e639566471841811ad29cd13a1f029d15b0dd85':
docs: update search suggest with google services apis including some optimizations for loading javascript resources
2013-02-26 11:27:37 -08:00
Scott Main
2e63956647
am 8429876f: am 7e447edf: docs: update search suggest with google services apis including some optimizations for loading javascript resources
...
* commit '8429876f53cbe617ea36d80a97454146f4b4b746':
docs: update search suggest with google services apis including some optimizations for loading javascript resources
2013-02-26 11:25:22 -08:00
Scott Main
8429876f53
am 7e447edf: docs: update search suggest with google services apis including some optimizations for loading javascript resources
...
* commit '7e447edffa935a3c94978304521099b9ac43b53d':
docs: update search suggest with google services apis including some optimizations for loading javascript resources
2013-02-26 11:21:21 -08:00
Scott Main
7e447edffa
docs: update search suggest with google services apis
...
including some optimizations for loading javascript resources
Change-Id: Idfea12bbb70a24a7853d997e8376e3db50e56760
2013-02-26 10:53:54 -08:00
Ying Wang
31428917bc
am 93cdbd0b: Merge "Run zipalign after classes.dex is removed from the apk"
...
* commit '93cdbd0b81e96649ebb789710429388c054bc377':
Run zipalign after classes.dex is removed from the apk
2013-02-25 17:49:28 -08:00
Ying Wang
93cdbd0b81
Merge "Run zipalign after classes.dex is removed from the apk"
2013-02-26 00:51:10 +00:00
Ying Wang
7f7d4d93b8
Run zipalign after classes.dex is removed from the apk
...
If LOCAL_DEX_PREOPT is enabled.
Change-Id: Ie2a706fbb77bc31c9fdb01c8435819c5de97ea28
2013-02-25 16:02:42 -08:00
Jean-Baptiste Queru
757e212ca2
am 0426da29: Merge "Fixed error message for using OpenJDK."
...
* commit '0426da292cc7cf4b7889e6105c8ef8aa9cee4ce3':
Fixed error message for using OpenJDK.
2013-02-25 13:18:26 -08:00
Jean-Baptiste Queru
0426da292c
Merge "Fixed error message for using OpenJDK."
2013-02-25 21:01:49 +00:00
Tim Roes
304f5194fd
Fixed error message for using OpenJDK.
...
Output a meaningful error message, when OpenJDK is detected
instead of giving the "wrong java version" output.
That output confused several users (from experiences in IRC)
since it gives you an output like "You are using java
version 1.6.0, right version would be Java SE 1.6".
Change-Id: I31ceeb03f1f98524b2b7de9b8be45231985fdb9e
Signed-off-by: Tim Roes <tim.roes88@googlemail.com>
2013-02-23 20:25:00 +01:00
Ken Sumrall
89fbf2e2ac
am 3a588682: am 8d27d6d3: am 44281a1f: Add unified fstab support to release tools
...
* commit '3a58868258aea60d17abe7e4169a3a64bf1a0d21':
Add unified fstab support to release tools
2013-02-23 00:55:23 -08:00
Ken Sumrall
3a58868258
am 8d27d6d3: am 44281a1f: Add unified fstab support to release tools
...
* commit '8d27d6d378fffba4c4254ccad6a1872692839a8c':
Add unified fstab support to release tools
2013-02-23 00:53:10 -08:00
Ken Sumrall
8d27d6d378
am 44281a1f: Add unified fstab support to release tools
...
* commit '44281a1f3ec99d650595b01b34185e1ffb129c6f':
Add unified fstab support to release tools
2013-02-23 00:49:39 -08:00
Nick Kralevich
3346da0a93
am 33b190f6: Merge "build: update fs_config calls for capabilities change."
...
* commit '33b190f6c6653b3c3493c725a96ff340c4466604':
build: update fs_config calls for capabilities change.
2013-02-22 18:28:13 -08:00
Nick Kralevich
33b190f6c6
Merge "build: update fs_config calls for capabilities change."
2013-02-23 02:04:55 +00:00
Ken Sumrall
44281a1f3e
Add unified fstab support to release tools
...
Update the release tools to be able to handle the new unified fstab.
Change-Id: Id9d1810c89aba415e83ae2fc586520f148ec73ef
2013-02-22 16:55:30 -08:00
The Android Open Source Project
33b8ce1bfd
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I652e19ace85b7b2be9c723b5ce1e7f36f7ae963f
2013-02-22 13:39:36 -08:00
Ying Wang
40ab92d002
am b303d5d7: Merge "[MIPS] Update build rules"
...
* commit 'b303d5d7d461e7f9eca3fc058c6eed69bfed4094':
[MIPS] Update build rules
2013-02-22 10:50:21 -08:00
Ying Wang
5cfe1c55c7
am 4703b491: Merge "We shouldn\'t use temporary variable in the build recipe."
...
* commit '4703b491d73938f7861b874a5212b2214a74e988':
We shouldn't use temporary variable in the build recipe.
2013-02-22 10:50:21 -08:00
Ying Wang
b303d5d7d4
Merge "[MIPS] Update build rules"
2013-02-22 18:03:15 +00:00
Ying Wang
4703b491d7
Merge "We shouldn't use temporary variable in the build recipe."
2013-02-22 18:02:04 +00:00
Ying Wang
514cc4d25e
We shouldn't use temporary variable in the build recipe.
...
Use $@ instead.
Change-Id: Ida0960a453b3701383a31f698c3163a297c4bce5
2013-02-22 10:01:33 -08:00
Scott Main
540bad2add
am 10bbe830: am 121a4a3e: am d6cb8fac: docs: fix padding for left-figure class
...
* commit '10bbe8309767a82ddc2d114856722b0f51bcbf87':
docs: fix padding for left-figure class
2013-02-21 14:33:06 -08:00
Scott Main
3c205c4fef
am 4edc153f: am 245a4f64: am 0e69c3e4: Merge "docs: add image frame style and left-float figure box" into jb-mr1-dev
...
* commit '4edc153fe6e44495deaf07e720bccc97d8e3fd07':
docs: add image frame style and left-float figure box
2013-02-21 14:33:06 -08:00
Robert Ly
e362f6bba4
am c6ff854b: am eb8edf43: am dae7b523: Revert "support differently named lists.js files"
...
* commit 'c6ff854bbf0b436dc3467801cd5aa595a5064c5a':
Revert "support differently named lists.js files"
2013-02-21 14:33:05 -08:00