Ying Wang
08b32584f4
am 4e32ac83: am dedff62c: Merge "Contain obj of ../ source files in their intermediate dir."
...
* commit '4e32ac834299da0c5892e9fb15777ca2cd335492':
Contain obj of ../ source files in their intermediate dir.
2015-03-13 02:59:09 +00:00
Ying Wang
fa8bcffa5a
am 28d74436: am fe593edd: Merge "Build only 64-bit odex for system server jars."
...
* commit '28d74436e1b36ca5c5a5265bc1759fa7183fc09c':
Build only 64-bit odex for system server jars.
2015-03-13 02:59:08 +00:00
Mathieu Chartier
0694eabe4d
JIT default opt-in
...
Bug: 17950037
(cherry picked from commit 2a2a03046e
)
Change-Id: I97fd6b1797e54ad3dea1930889f32a717543490d
2015-03-12 18:27:54 -07:00
Ying Wang
84f62c3ad3
resolved conflicts for merge of 828e92d6
to master
...
Change-Id: Idc9b059f840f328e86e3972882ccef6d5ee4e1d9
2015-03-12 14:36:29 -07:00
Ying Wang
209108298f
am 0aef0966: am fafe5ac8: Merge "Signapk.java: hide the password"
...
* commit '0aef09668e04b1de2ab86291c5f734a5dc718891':
Signapk.java: hide the password
2015-03-12 15:35:56 +00:00
Ying Wang
25c894bf70
am ec447f36: am 168357ae: Merge "Support .asm being compiled by yasm targeted for x86_64."
...
* commit 'ec447f368a0622781a0b6f95d422d30f480a24b5':
Support .asm being compiled by yasm targeted for x86_64.
2015-03-12 15:35:53 +00:00
Ying Wang
ab27f6e775
am b396517c: am 501af528: Merge "Increase system and userdata partition sizes."
...
* commit 'b396517cb25ca85d1c17b4d4e09be87cdf8256b4':
Increase system and userdata partition sizes.
2015-03-12 15:35:51 +00:00
Ying Wang
83a1934085
Use "rsync -a" to copy over $(TARGET_ROOT_OUT) to $(TARGET_RECOVERY_OUT)
...
"cp -Rf" fails on Mac OS when some broken symlinks exist in the dest
dir.
Also switch to better shell error handling when copying
init.recovery.*.rc.
Change-Id: Idd05f7604736b234619f62be12dd108fac91fed1
2015-03-11 16:48:01 -07:00
Ying Wang
4e32ac8342
am dedff62c: Merge "Contain obj of ../ source files in their intermediate dir."
...
* commit 'dedff62c8e44320dec8f667e27fdcd4cdff1430d':
Contain obj of ../ source files in their intermediate dir.
2015-03-11 20:59:44 +00:00
Ying Wang
28d74436e1
am fe593edd: Merge "Build only 64-bit odex for system server jars."
...
* commit 'fe593edd5377f5046ef07d2efa53670451bd13a4':
Build only 64-bit odex for system server jars.
2015-03-11 20:59:43 +00:00
Ying Wang
dedff62c8e
Merge "Contain obj of ../ source files in their intermediate dir."
2015-03-11 20:43:41 +00:00
Ying Wang
fe593edd53
Merge "Build only 64-bit odex for system server jars."
2015-03-11 20:43:32 +00:00
Ying Wang
828e92d67a
am a2ad467f: Merge "Support modules to be installed directly to recovery.img"
...
* commit 'a2ad467f7a82511901625aa8dd8253c19df87a1c':
Support modules to be installed directly to recovery.img
2015-03-11 17:57:02 +00:00
Ying Wang
a2ad467f7a
Merge "Support modules to be installed directly to recovery.img"
2015-03-11 17:40:54 +00:00
Ying Wang
f25838a7ea
Support modules to be installed directly to recovery.img
...
Previously the recovery binary was configured to be installed to the
system.img and then got copied to recovery.img in the recovery.img's
build rule.
With this change, a module, such as the recovery binary, can configure
itself to be installed directly to the recovery.img, just like how other
modules get installed to system.img.
Bug: 19667686
Change-Id: I46b0b4a95cf078a68999db9c0f6635d6a3f5cd86
2015-03-11 10:38:13 -07:00
Ying Wang
0aef09668e
am fafe5ac8: Merge "Signapk.java: hide the password"
...
* commit 'fafe5ac81940caaa6b222433a2fd9ef5e1239686':
Signapk.java: hide the password
2015-03-11 17:00:10 +00:00
Ying Wang
ec447f368a
am 168357ae: Merge "Support .asm being compiled by yasm targeted for x86_64."
...
* commit '168357aeda0c71cd54f9bcfe72f2fca2d3baad36':
Support .asm being compiled by yasm targeted for x86_64.
2015-03-11 16:49:07 +00:00
Ying Wang
b396517cb2
am 501af528: Merge "Increase system and userdata partition sizes."
...
* commit '501af5280fd36c6634b91ac87a55c780d8634a43':
Increase system and userdata partition sizes.
2015-03-11 16:49:06 +00:00
Ying Wang
fafe5ac819
Merge "Signapk.java: hide the password"
2015-03-11 16:46:00 +00:00
Ying Wang
168357aeda
Merge "Support .asm being compiled by yasm targeted for x86_64."
2015-03-11 16:37:25 +00:00
Ying Wang
501af5280f
Merge "Increase system and userdata partition sizes."
2015-03-11 16:37:09 +00:00
Douglas Leung
3713ded238
Increase system and userdata partition sizes.
...
The extra system space is needed for mips64r6/mips32r6 quick
mode images and the extra userdata is needed to run ART tests.
Change-Id: I96dc1553d950dcf046b57feff10a369e9155bd4d
2015-03-11 16:36:54 +00:00
Ying Wang
fb22a42d4f
Contain obj of ../ source files in their intermediate dir.
...
Previously when a file in LOCAL_SRC_FILES starts with "../", the object
file may escape out of the module's intermediate directory, because we
insert the source file's path (but not with LOCAL_PATH) to the object
file's path. Even worse when two object files escape to the same destination
and cause conflict.
This change fixes the issue by removing the "../" inside the object
files' paths. To do that, we have to set up the compilation rules for
those files one by one, instead of using the one-for-all static
pattern rules.
Bug: 19641115
Change-Id: I19f3c48ece3244fa14acb2caa609deea710840d3
2015-03-10 19:05:15 -07:00
Ying Wang
3752614de1
Support modules to be installed directly to recovery.img
...
Previously the recovery binary was configured to be installed to the
system.img and then got copied to recovery.img in the recovery.img's
build rule.
With this change, a module, such as the recovery binary, can configure
itself to be installed directly to the recovery.img, just like how other
modules get installed to system.img.
Bug: 19667686
Change-Id: I46b0b4a95cf078a68999db9c0f6635d6a3f5cd86
2015-03-10 12:02:57 -07:00
Ying Wang
c7ca6173ce
Build only 64-bit odex for system server jars.
...
By default we build both 64-bit and 32-bit odex files for a Java library.
With this change:
- For system server jars (PRODUCT_SYSTEM_SERVER_JARS), we build only
64-bit odex;
- A library can opt to build only 64-bit odex with
"LOCAL_MULTILIB := first".
Bug: 19650934
Change-Id: Ic0b7fd381396ed276e6129f883881c5c41c6e154
2015-03-10 11:08:05 -07:00
Ying Wang
fe1e5c3453
Support .asm being compiled by yasm targeted for x86_64.
...
Change-Id: Ia6425c38dd2f7ad2dc697213cd61b7515b9e7aff
2015-03-09 18:57:40 -07:00
Christopher Ferris
390f9fdc07
am f3382443: am 46ba5456: am 708b56ed: Merge "Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty."
...
* commit 'f3382443cde82feeb1ceee32a2538f96fba44b80':
Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty.
2015-03-08 00:12:48 +00:00
Andreas Gampe
8b73c76a30
am 6faf9925: am e380c11d: am 9a0382ff: Merge "Build: Fail preopting apps when there are verifier errors"
...
* commit '6faf9925b3c1f833681443195e43c07e11570b52':
Build: Fail preopting apps when there are verifier errors
2015-03-08 00:12:47 +00:00
Chih-Hung Hsieh
131424e74c
am ad19f1cc: am 137a9fd6: am 9575e13a: Merge "Filter out unsupported flag: -fprefetch-loop-arrays"
...
* commit 'ad19f1cc17432b2086a6dde5ebbd987b844e97ef':
Filter out unsupported flag: -fprefetch-loop-arrays
2015-03-08 00:12:45 +00:00
Christopher Ferris
f3382443cd
am 46ba5456: am 708b56ed: Merge "Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty."
...
* commit '46ba5456ad33e0674929eefff0753e21301e6eba':
Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty.
2015-03-08 00:07:59 +00:00
Andreas Gampe
6faf9925b3
am e380c11d: am 9a0382ff: Merge "Build: Fail preopting apps when there are verifier errors"
...
* commit 'e380c11dde6a9bffa786c0ea7a72608001c7d48e':
Build: Fail preopting apps when there are verifier errors
2015-03-08 00:07:41 +00:00
Chih-Hung Hsieh
ad19f1cc17
am 137a9fd6: am 9575e13a: Merge "Filter out unsupported flag: -fprefetch-loop-arrays"
...
* commit '137a9fd6229b6391fa99bb5a99a087c04094b759':
Filter out unsupported flag: -fprefetch-loop-arrays
2015-03-08 00:06:48 +00:00
Christopher Ferris
46ba5456ad
am 708b56ed: Merge "Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty."
...
* commit '708b56edc879847f418108cf360bc990bb2a502a':
Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty.
2015-03-07 17:09:20 +00:00
Santos Cordon
e0bd11dfb3
Merge "Add Call Log backup to basic telephony spec."
2015-03-07 01:04:23 +00:00
Christopher Ferris
708b56edc8
Merge "Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty."
2015-03-06 21:27:47 +00:00
Santos Cordon
386fa7350a
Add Call Log backup to basic telephony spec.
...
Change-Id: I9c101044a7750141a01e3a7e5c6ed127471f10bc
2015-03-06 12:45:05 -08:00
Andreas Gampe
e380c11dde
am 9a0382ff: Merge "Build: Fail preopting apps when there are verifier errors"
...
* commit '9a0382ffe64ad8ccecc15141779627a882f31ee0':
Build: Fail preopting apps when there are verifier errors
2015-03-06 19:16:47 +00:00
Andreas Gampe
9a0382ffe6
Merge "Build: Fail preopting apps when there are verifier errors"
2015-03-06 19:12:09 +00:00
Christopher Ferris
9de4d5ebb3
Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty.
...
On non-arm architectures, there is no TARGET_CPU_VARIANT set. For x86,
art assumes that the CPU variant is actually the TARGET_ARCH_VARIANT.
Therefore, if no TARGET_CPU_VARIANT is set, use the TARGET_ARCH_VARIANT.
If TARGET_ARCH_VARIANT is not set, then use default as the value.
Change-Id: I17fc9e3ac7412462103b8f0b287fce106298b741
2015-03-06 10:19:12 -08:00
Yohann Roussel
0d70cc4a72
Merge "Allow to pass arguments to Jill"
2015-03-06 10:05:54 +00:00
Andreas Gampe
06d86e929d
Build: Fail preopting apps when there are verifier errors
...
Expectation is that classes in pre-compiled apps should be structurally
sound and not cause a hard failure.
Bug: 19606409
Change-Id: Idc9da4d4c6bd259555671c657d3414a97940717f
2015-03-05 19:18:18 -08:00
Chih-Hung Hsieh
137a9fd622
am 9575e13a: Merge "Filter out unsupported flag: -fprefetch-loop-arrays"
...
* commit '9575e13aa71248b1ded3e07849a4a7523e76d639':
Filter out unsupported flag: -fprefetch-loop-arrays
2015-03-06 01:02:27 +00:00
Chih-Hung Hsieh
9575e13aa7
Merge "Filter out unsupported flag: -fprefetch-loop-arrays"
2015-03-06 00:48:52 +00:00
Chih-Hung Hsieh
78df832481
Filter out unsupported flag: -fprefetch-loop-arrays
...
Change-Id: I55ba9045948a910ebd76c09f9f4ebb6b37eed1e7
2015-03-05 16:02:04 -08:00
Ying Wang
690227763c
am 8ed194d3: am a7c669f2: am 71c64dc1: Merge "Reorder lib paths in transform-bc-to-so to avoid build race condition."
...
* commit '8ed194d30a5e635c3de9e0545215e6cda9bb19d3':
Reorder lib paths in transform-bc-to-so to avoid build race condition.
2015-03-05 20:18:19 +00:00
Ying Wang
8ed194d30a
am a7c669f2: am 71c64dc1: Merge "Reorder lib paths in transform-bc-to-so to avoid build race condition."
...
* commit 'a7c669f25b087c02fae43d8ead9e9ebae3f448a3':
Reorder lib paths in transform-bc-to-so to avoid build race condition.
2015-03-05 20:11:17 +00:00
Ying Wang
a7c669f25b
am 71c64dc1: Merge "Reorder lib paths in transform-bc-to-so to avoid build race condition."
...
* commit '71c64dc1033aed7de0ebb215fc35d09e7fcd9db0':
Reorder lib paths in transform-bc-to-so to avoid build race condition.
2015-03-05 20:05:17 +00:00
Ying Wang
71c64dc103
Merge "Reorder lib paths in transform-bc-to-so to avoid build race condition."
2015-03-05 20:00:33 +00:00
Adrian Roos
0f6cdb7580
Merge "Allow variable overrides in mmm and mmma"
2015-03-05 19:39:42 +00:00
Ying Wang
bfc436969d
Reorder lib paths in transform-bc-to-so to avoid build race condition.
...
We should put the NDK library path before
$(TARGET_OUT_INTERMEDIATE_LIBRARIES), so that we link against the NDK
libc/libm, instead of the platform libc/libm in
$(TARGET_OUT_INTERMEDIATE_LIBRARIES), which may still being written out,
because we don't have dependency on them.
Bug: 19613709
Change-Id: I26a8b272e38b7436bca3324246b21cd71349662b
2015-03-05 11:29:30 -08:00