Commit Graph

6284 Commits

Author SHA1 Message Date
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
168357aeda Merge "Support .asm being compiled by yasm targeted for x86_64." 2015-03-11 16:37:25 +00: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
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
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
78df832481 Filter out unsupported flag: -fprefetch-loop-arrays
Change-Id: I55ba9045948a910ebd76c09f9f4ebb6b37eed1e7
2015-03-05 16:02:04 -08: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
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
29a0178993 am 9b19382f: resolved conflicts for merge of fc759204 to stage-aosp-master
* commit '9b19382f0e55be199da4b3f604fc114aba8fb2fc':
  Allow flashing a squashfs system image
2015-03-05 00:01:46 +00: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
d1e748c071 am a10263ed: am ccf1cc55: Merge "Fix the mac build."
* commit 'a10263ed1f1532127a135943dce993443c5dca51':
  Fix the mac build.
2015-03-04 06:29:34 +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
d666bb1009 Fix the mac build.
Bug: 19567451
Change-Id: I6d15259520c9813df1a44d9244c99482f713d114
2015-03-03 21:47:04 -08:00
Ying Wang
4aa76e5563 am 850e0b3a: am edab98a4: Merge "Catch more cases of static host executables."
* commit '850e0b3affe8a1b047eeb136bf104ed8759f8dad':
  Catch more cases of static host executables.
2015-03-04 03:35:38 +00: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
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
4162cc606c am 21b75e26: am d52afdd6: Merge "(Hopefully) fix the Mac build."
* commit '21b75e269e13f4e8ccec001d9de676c1d64e4644':
  (Hopefully) fix the Mac build.
2015-03-04 01:57:06 +00: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
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
619c52124b am 94451789: am cfafe554: Merge "Fix building static host executables."
* commit '94451789f4ec9d0ea884c0af4856aa846bc71d2e':
  Fix building static host executables.
2015-03-04 00:27:10 +00: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
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
Chih-Hung Hsieh
d40a53b494 am 9a75b4ec: am d408e607: Merge "Disable tail call optimization and use -mstackrealign to boot up on fugu."
* commit '9a75b4ec35eaddb38a49c8283ef0f1db2c827a52':
  Disable tail call optimization and use -mstackrealign to boot up on fugu.
2015-03-03 01:50:55 +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
cafb413c2d am 59c24c79: am 095c4515: Merge "Remove unused variables."
* commit '59c24c790ab04127330d58459ceee1dcd6dd3ab1':
  Remove unused variables.
2015-02-27 16:39:59 +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
095c451541 Merge "Remove unused variables." 2015-02-27 11:43:34 +00:00
Ying Wang
641e283f5e am 8485fb07: am 4eec22a6: Merge "Use a less freqent dummy file name: zipdummy"
* commit '8485fb074bb1b751224b167273de0f443b94680f':
  Use a less freqent dummy file name: zipdummy
2015-02-26 18:11:36 +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
dcd90831e5 Use a less freqent dummy file name: zipdummy
Previously if user has a directory with name dummy in the root of the
source tree, "zip -qd package.apk dummy" fails with:
"zip error: Nothing to do!".
This change mitigates the error.

Change-Id: I642e3bf0378e5b9911a068ecb72f795b3e92f1fe
2015-02-26 09:36:27 -08:00
Narayan Kamath
738871f6eb am e886392c: am 37a44faa: Merge "Store native libs aligned to PAGE_SIZE"
* commit 'e886392c37a24e25ee1b0e439d74e9b07df2d608':
  Store native libs aligned to PAGE_SIZE
2015-02-26 12:51:28 +00:00
Narayan Kamath
e886392c37 am 37a44faa: Merge "Store native libs aligned to PAGE_SIZE"
* commit '37a44faa7266c8a7e0cc5077a4c028d6f5bfa7f7':
  Store native libs aligned to PAGE_SIZE
2015-02-26 12:45:34 +00:00
Narayan Kamath
bc0d368896 Remove unused variables.
Follow up from 13e5965306.

Change-Id: I370e52acd998ce72b4d7dbf2aba604d4b08bb0cf
2015-02-26 12:40:34 +00:00
Dmitriy Ivanov
13e5965306 Store native libs aligned to PAGE_SIZE
- Add a new flag to zipalign (-p) that page aligns shared
  libraries (zip entries ending with ".so") in the archive.

- Add a new build variable LOCAL_PAGE_ALIGN_SHARED_LIBRARIES
  to turn on this behaviour in zipalign.

- Add a new LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS to control
  zip behaviour.

Bug: 8076853
Bug: 19330157

Co-Authored-By: Simon Baldwin <simonb@google.com>
Co-Authored-By: Dimitry Ivanov <dimitry@google.com>
Change-Id: I1aa2c039bb2a590ae72f256acc9ba5401c2c59b1
2015-02-26 12:31:40 +00:00
Dan Albert
9ddc52c1e4 am 13baa319: am 876f45e7: Merge "Make some warnings impossible to override."
* commit '13baa3192149a8a1de5885c8a85f95155ff5d83d':
  Make some warnings impossible to override.
2015-02-25 23:24:35 +00:00
Dan Albert
13baa31921 am 876f45e7: Merge "Make some warnings impossible to override."
* commit '876f45e73f938cdaa7cfc25c43822fc6b274f105':
  Make some warnings impossible to override.
2015-02-25 23:17:56 +00:00
Dan Albert
876f45e73f Merge "Make some warnings impossible to override." 2015-02-25 23:13:13 +00:00