Commit Graph

21271 Commits

Author SHA1 Message Date
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 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 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 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 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
Christopher Ferris 708b56edc8 Merge "Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty." 2015-03-06 21:27:47 +00: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
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 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
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
Mohamad Ayyash 9b19382f0e resolved conflicts for merge of fc759204 to stage-aosp-master
Change-Id: Icf58e881286a66cb3ca4cb122fa8c11ec217fbab
2015-03-04 15:43:45 -08:00
Mohamad Ayyash fc759204d6 Merge "Allow flashing a squashfs system image" 2015-03-04 22:55:22 +00:00
Dan Albert a10263ed1f am ccf1cc55: Merge "Fix the mac build."
* commit 'ccf1cc55a4448dc43302624da07d3211356473e2':
  Fix the mac build.
2015-03-04 06:23:10 +00:00
Dan Albert ccf1cc55a4 Merge "Fix the mac build." 2015-03-04 06:17:20 +00:00
Dan Albert d666bb1009 Fix the mac build.
Bug: 19567451
Change-Id: I6d15259520c9813df1a44d9244c99482f713d114
2015-03-03 21:47:04 -08:00
Ying Wang 850e0b3aff am edab98a4: Merge "Catch more cases of static host executables."
* commit 'edab98a40a0954789c21eaf6c122c99be2ce2d99':
  Catch more cases of static host executables.
2015-03-04 03:28:53 +00:00
Ying Wang edab98a40a Merge "Catch more cases of static host executables." 2015-03-04 03:24:04 +00:00
Mohamad Ayyash b97746ef09 Allow flashing a squashfs system image
Change-Id: Ic51d11274784a8d2e9d57d5f0b821ebc89680e5a
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-03-03 18:54:50 -08:00
Dan Albert b5eb905729 Catch more cases of static host executables.
Bug: 19567451
Change-Id: Ie1de436db74b727421449b43b192e9599ca8fca6
2015-03-03 18:30:27 -08:00
Dan Albert 21b75e269e am d52afdd6: Merge "(Hopefully) fix the Mac build."
* commit 'd52afdd682b26ea6a13c066d6f037c9df6693489':
  (Hopefully) fix the Mac build.
2015-03-04 01:50:21 +00:00
Dan Albert d52afdd682 Merge "(Hopefully) fix the Mac build." 2015-03-04 01:46:22 +00:00
Dan Albert 4f2afde252 (Hopefully) fix the Mac build.
The Mac linker doesn't understand --start-group, which is needed for
properly linking libgcc/libc statically. It isn't needed for dynamic
executables though, so use that driver behavior where appropriate.

Bug: 19567451
Change-Id: Ifeb03bea55bc87561c64ddafdb99f664fef0f00e
2015-03-03 17:42:28 -08:00
Dan Albert 94451789f4 am cfafe554: Merge "Fix building static host executables."
* commit 'cfafe554c0852f5b2c05e5d895b47d032daeec2e':
  Fix building static host executables.
2015-03-03 23:24:40 +00:00
Dan Albert cfafe554c0 Merge "Fix building static host executables." 2015-03-03 23:20:53 +00:00
Dan Albert 8bf4cc97c2 Fix building static host executables.
BUILD_HOST_static=1 forces all host binaries to be statically linked.
Since -nodefaultlibs was passed (to disable libstdc++), libgcc wasn't
being passed. This change emulates the driver's behavior.

Also fix default STL selection for BUILD_HOST_static.

Bug: 19567451
Change-Id: I617aab782d40ac76ca5a7d9dddf0f202a4e3a69b
2015-03-03 15:08:11 -08:00
Greg Hackmann fc93e284dd am 6492792d: Merge "Consult tput about color control sequence support"
* commit '6492792d8a30f218fff6d54765ba5502de0a9a2a':
  Consult tput about color control sequence support
2015-03-03 19:02:37 +00:00
Greg Hackmann 6492792d8a Merge "Consult tput about color control sequence support" 2015-03-03 18:55:21 +00:00
Chih-Hung Hsieh 9a75b4ec35 am d408e607: Merge "Disable tail call optimization and use -mstackrealign to boot up on fugu."
* commit 'd408e6071831f150a08f895ee2de6cfe8c7ff858':
  Disable tail call optimization and use -mstackrealign to boot up on fugu.
2015-03-03 01:44:26 +00:00
Chih-Hung Hsieh d408e60718 Merge "Disable tail call optimization and use -mstackrealign to boot up on fugu." 2015-03-03 01:39:28 +00:00
Chih-Hung Hsieh 73e734bea5 Disable tail call optimization and use -mstackrealign to boot up on fugu.
http://llvm.org/bugs/show_bug.cgi?id=15086,
llvm tail call optimization is wrong for x86.

For Android/x86 to use SSE* instructions safely, stack should be 16-byte
aligned before JNI function call, which isn't true for all x86 device,
so -mstackrealign should be the default.

BUG: 19234330
Change-Id: I4c6676366788772dbe64fd7f0dd33b3ed5c9b80e
2015-03-02 16:50:39 -08:00
Narayan Kamath 2479a0987d am 30b5ed7b: Merge "Fix zipalign README file and usage strings."
* commit '30b5ed7b1e8c67c816d64ad1b7c9bde3c3b5019c':
  Fix zipalign README file and usage strings.
2015-02-27 17:26:49 +00:00
Narayan Kamath 30b5ed7b1e Merge "Fix zipalign README file and usage strings." 2015-02-27 17:21:30 +00:00
Narayan Kamath 59c24c790a am 095c4515: Merge "Remove unused variables."
* commit '095c451541765c7efb9d5a8152f8ef15626ccedb':
  Remove unused variables.
2015-02-27 16:33:23 +00:00
Narayan Kamath e0b8d19f31 Fix zipalign README file and usage strings.
Addresses comments from change 13e5965306.

Change-Id: I0a2c0048781858d3aa06347a77220547cfcdcebe
2015-02-27 14:17:17 +00:00
Narayan Kamath 095c451541 Merge "Remove unused variables." 2015-02-27 11:43:34 +00:00
Ying Wang 8485fb074b am 4eec22a6: Merge "Use a less freqent dummy file name: zipdummy"
* commit '4eec22a6627927aaa11a67e3e18d36534af81856':
  Use a less freqent dummy file name: zipdummy
2015-02-26 18:04:07 +00:00
Ying Wang 4eec22a662 Merge "Use a less freqent dummy file name: zipdummy" 2015-02-26 17:57:58 +00:00