Commit Graph

22137 Commits

Author SHA1 Message Date
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
Adrian Roos afa958f413 Allow variable overrides in mmm and mmma
Change-Id: I12e8cc62e72d0af3b777f69727eafec9aa1713e3
2015-03-05 19:52:55 +01:00
Yohann Roussel 801f2c44d0 Allow to pass arguments to Jill
Bug: 19026410
Change-Id: I3f3d7c0e7f8d6cc7150ae560b8734093798e8299
2015-03-05 14:54:06 +01:00
Mohamad Ayyash b8c20461d3 am 29a01789: am 9b19382f: resolved conflicts for merge of fc759204 to stage-aosp-master
* commit '29a01789930f74ffecba7f6360577e5703092606':
  Allow flashing a squashfs system image
2015-03-05 00:06:34 +00: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
Yohann Roussel e925e7fd1b Merge "Use Jack by default" 2015-03-04 14:21:17 +00:00
Dan Albert 96c01f83a4 am d1e748c0: am a10263ed: am ccf1cc55: Merge "Fix the mac build."
* commit 'd1e748c071fdf3508c371f0806614d5f67437333':
  Fix the mac build.
2015-03-04 06:36:02 +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 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 e8ca99c4fb am 4aa76e55: am 850e0b3a: am edab98a4: Merge "Catch more cases of static host executables."
* commit '4aa76e5563d3951b66de612cf7015ce554863349':
  Catch more cases of static host executables.
2015-03-04 03:43:11 +00: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
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 4eaeae59b0 am 4162cc60: am 21b75e26: am d52afdd6: Merge "(Hopefully) fix the Mac build."
* commit '4162cc606c05f914aefd4edfa75486767777b67a':
  (Hopefully) fix the Mac build.
2015-03-04 02:05:48 +00: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 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
Mohamad Ayyash 73f17f0f76 Merge "Allow flashing a squashfs system image" 2015-03-04 00:42:12 +00:00
Dan Albert dcd1f6efe6 am 619c5212: am 94451789: am cfafe554: Merge "Fix building static host executables."
* commit '619c52124b2b34571695deebe8f5e9d86949aea2':
  Fix building static host executables.
2015-03-04 00:32:14 +00: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 cfafe554c0 Merge "Fix building static host executables." 2015-03-03 23:20:53 +00:00
Mohamad Ayyash 6894695819 Allow flashing a squashfs system image
Change-Id: Ic51d11274784a8d2e9d57d5f0b821ebc89680e5a
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-03-03 15:14:37 -08: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 e39b0c118a am 01e0cb2c: am fc93e284: am 6492792d: Merge "Consult tput about color control sequence support"
* commit '01e0cb2ce011e65099737ca6052d10758d885c8b':
  Consult tput about color control sequence support
2015-03-03 22:24:52 +00:00
Jesse Zhao 39e7d2a072 Merge "Fix the error that free_string is not defined." 2015-03-03 21:57:40 +00:00
Greg Hackmann 01e0cb2ce0 am fc93e284: am 6492792d: Merge "Consult tput about color control sequence support"
* commit 'fc93e284ddc127d51455da98426dec4b8221b1a5':
  Consult tput about color control sequence support
2015-03-03 19:10:31 +00: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 69792a4132 am d40a53b4: am 9a75b4ec: am d408e607: Merge "Disable tail call optimization and use -mstackrealign to boot up on fugu."
* commit 'd40a53b4940660aa0181e4bbd118fc2bbf5373b2':
  Disable tail call optimization and use -mstackrealign to boot up on fugu.
2015-03-03 01:58:54 +00: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