Commit graph

7192 commits

Author SHA1 Message Date
Ying Wang
d054f1f747 am 7ffd7c20: am df5c798f: Merge "[MIPS] Temporarily disable Mips shared-textrel errors"
* commit '7ffd7c207be55b86416845dbd5ffa8f69518ab68':
  [MIPS] Temporarily disable Mips shared-textrel errors
2015-05-14 16:35:30 +00:00
Ying Wang
df5c798f36 Merge "[MIPS] Temporarily disable Mips shared-textrel errors" 2015-05-14 16:11:59 +00:00
Filip Gruszczynski
8429745720 am 8eade31f: am 7fbb988d: Merge "Add percent library to support libraries build." into lmp-mr1-ub-dev
* commit '8eade31f989224d006f012364ab91f1c9a102c5c':
  Add percent library to support libraries build.
2015-05-14 00:55:58 +00:00
Filip Gruszczynski
8eade31f98 am 7fbb988d: Merge "Add percent library to support libraries build." into lmp-mr1-ub-dev
* commit '7fbb988da154ad91461c3d51994ae0ff99d94032':
  Add percent library to support libraries build.
2015-05-13 23:46:29 +00:00
Elliott Hughes
e990e929a4 am 385cdb78: am 0dac6788: Merge "Revert "Revert "Turn on _FORTIFY_SOURCE=2 for the host."""
* commit '385cdb7855bfb3983d21fe7344d56d863f638985':
  Revert "Revert "Turn on _FORTIFY_SOURCE=2 for the host.""
2015-05-13 21:34:09 +00:00
Elliott Hughes
a1f24be45c am 56ad4250: am 1d8e8c96: Merge "Add libbenchmark\'s new dependency on libbase."
* commit '56ad4250257004a3281db9c703cba4eb8cd6ada4':
  Add libbenchmark's new dependency on libbase.
2015-05-13 21:13:10 +00:00
Elliott Hughes
0dac67880b Merge "Revert "Revert "Turn on _FORTIFY_SOURCE=2 for the host.""" 2015-05-13 21:12:22 +00:00
Elliott Hughes
1d8e8c9694 Merge "Add libbenchmark's new dependency on libbase." 2015-05-13 20:53:32 +00:00
Elliott Hughes
b2b6646578 Add libbenchmark's new dependency on libbase.
Change-Id: I6f9700b3e51a3b681d3d91b88103eed31764f61e
2015-05-13 13:47:30 -07:00
Elliott Hughes
f05d960f41 am 463377d0: am 2a3034b3: Merge "Revert "Turn on _FORTIFY_SOURCE=2 for the host.""
* commit '463377d0c43a7a0e096d5d428b161061863089bb':
  Revert "Turn on _FORTIFY_SOURCE=2 for the host."
2015-05-13 20:29:40 +00:00
Elliott Hughes
3afd77941b am 35fb49df: am b58119ea: Merge "Turn on _FORTIFY_SOURCE=2 for the host."
* commit '35fb49df32f0f115f93cce04f7e0fe1be2301b83':
  Turn on _FORTIFY_SOURCE=2 for the host.
2015-05-13 20:29:38 +00:00
dcashman
5fd0b6d43b resolved conflicts for merge of eab5ab5d to mnc-dev-plus-aosp
Change-Id: Ic7ba16887aa778fad6911a4bfb155e91b9b3c88e
2015-05-13 13:20:05 -07:00
Elliott Hughes
7dd8ec1761 Revert "Revert "Turn on _FORTIFY_SOURCE=2 for the host.""
This reverts commit e27b214fc2.

Change-Id: I3d739c0594dbe4ecd62c5b07064ada7de6cdaadb
2015-05-13 20:15:19 +00:00
Elliott Hughes
2a3034b336 Merge "Revert "Turn on _FORTIFY_SOURCE=2 for the host."" 2015-05-13 19:33:17 +00:00
Elliott Hughes
e27b214fc2 Revert "Turn on _FORTIFY_SOURCE=2 for the host."
This reverts commit 224806d00e.

Change-Id: I654157ec4be7ff95356ab4a25b27c44762793e74
2015-05-13 19:32:59 +00:00
Elliott Hughes
b58119eab4 Merge "Turn on _FORTIFY_SOURCE=2 for the host." 2015-05-13 19:10:37 +00:00
dcashman
c0ba40b8a1 Merge "Remove libc++ from prepackaged shared libs in cts." into mnc-dev 2015-05-13 18:38:18 +00:00
dcashman
49b362d4b8 Remove libc++ from prepackaged shared libs in cts.
Commit 28acbeab18f6083299c07f9ebe769d22e49f8107 removed the dependency of
sepolicy-analyze on libc++, eliminating the only consumer of the library for the
cts host-side tests.  Remove the library since it is no longer needed but leave
the ability to add other shared libs in the future.

(cherry-pick of commit: 214a171424)

Bug: 19566396
Change-Id: I36f45c3e92c2d6370e98baa4c527835af66691fa
2015-05-13 11:31:25 -07:00
dcashman
3979b9bdbc Merge "Remove libc++ from prepackaged shared libs in cts." 2015-05-13 18:19:42 +00:00
Duane Sand
3dfd20aea4 [MIPS] Temporarily disable Mips shared-textrel errors
Clang++ for Mips and Mips64 generates read-only exception unwind
tables that trigger DT_TEXTREL warnings at link time.  Until Clang
is fixed, ignore those performance warnings instead of failing the build.

With this patch, Mips clang++ can be (optionally) used when building
libdeqp.

NDK's Mips llvm has been using an alternate temporary fix, marking the
.gcc_exception_table section as read-write for Mips only:
   https://android-review.googlesource.com/#/c/119660/

A permanent fix using a read-only exception table is pending upstream:
   http://reviews.llvm.org/D9669

Change-Id: Ie0cd7da398acbe45dbe39adc251e7fd5b5ca1445
2015-05-13 11:07:20 -07:00
Andrew Hsieh
46cc3992cc am 4b4c0df5: am 75f3c5a8: Merge "Revert "Revert "Enable linker -fix-cortex-a53-843419"""
* commit '4b4c0df54aa54693854fafd0dca1674ef90011fb':
  Revert "Revert "Enable linker -fix-cortex-a53-843419""
2015-05-13 16:32:34 +00:00
dcashman
214a171424 Remove libc++ from prepackaged shared libs in cts.
Commit 28acbeab18f6083299c07f9ebe769d22e49f8107 removed the dependency of
sepolicy-analyze on libc++, eliminating the only consumer of the library for the
cts host-side tests.  Remove the library since it is no longer needed but leave
the ability to add other shared libs in the future.

Bug: 19566396
Change-Id: I4fbfa44ce9f099ad058fd0630ac48749e389e3e1
2015-05-13 09:07:51 -07:00
Dan Albert
132033c5b8 am 939e5a0f: am a1e55c5f: Merge "Fix using libc++_static in dynamic binaries."
* commit '939e5a0fa457931309ce3a07636d370fa365c012':
  Fix using libc++_static in dynamic binaries.
2015-05-13 15:52:38 +00:00
Bart Sears
d5958661c5 am 0ed694f3: DO NOT MERGE - Change PLATFORM_VERSION from MNC to M
* commit '0ed694f3261411fb6f028539aabedfba87580c1f':
  DO NOT MERGE - Change PLATFORM_VERSION from MNC to M
2015-05-13 05:43:17 +00:00
Elliott Hughes
224806d00e Turn on _FORTIFY_SOURCE=2 for the host.
Bug: http://b/20558757
Change-Id: Ic0c173d25dc6b2fa9c3122a523af5f37bc1b8c55
2015-05-12 21:41:52 -07:00
Bart Sears
0ed694f326 DO NOT MERGE - Change PLATFORM_VERSION from MNC to M
Goodbye to the cookie...

Change-Id: I0474115250411ccdfbdc769c6a464f9dbc460e8f
2015-05-12 18:42:13 -07:00
Andrew Hsieh
75f3c5a849 Merge "Revert "Revert "Enable linker -fix-cortex-a53-843419""" 2015-05-13 01:08:51 +00:00
Dan Albert
93f22ee7e2 Merge "Disallow using stlport." into mnc-dev 2015-05-12 23:11:10 +00:00
Evgeniy Stepanov
04cfb9e113 Merge changes Idd0f477f,I937d2020,I3b95c868 into mnc-dev
* changes:
  --no-as-needed needs -Wl.
  Fix AddressSanitizer link order and multilib setup.
  Make asan more closely match clang behavior.
2015-05-12 22:34:16 +00:00
Dan Albert
2a4a023a54 Fix using libc++_static in dynamic binaries.
Change-Id: I89bacfbf270d2d1bc1b9b2fa6951b355a67b808c
2015-05-12 14:07:18 -07:00
Dan Albert
bdd8ca0604 --no-as-needed needs -Wl.
Not sure why my checkbuild passed.

Change-Id: Idd0f477faebf0b7d79998c8a86610728c2c8cc5d
2015-05-12 14:04:55 -07:00
Evgenii Stepanov
6708b6c99c Fix AddressSanitizer link order and multilib setup.
ASan runtime library (when using dynamic linking) must be the first
dependency of the main executable to achieve correct symbol
interposition. This matches how the clang driver works.

In multilib setup, ASan-RT name depends on the target arch:
  /system/lib/libclang_rt.asan-arm-android.so
  /system/lib64/libclang_rt.asan-arm64-android.so

We also set RPATH to /system/lib/asan or /system/lib64/asan
to have a place for ASan-only versions of system libraries.

Change-Id: I937d202077b6e433ba476c075d31be818b662d53
2015-05-12 13:40:29 -07:00
Dan Albert
eebb800170 Make asan more closely match clang behavior.
Always link libm with asan. Hasn't been a problem before because ASAN
was only ever used when libc++ was as well, which already links libm.

Pass --no-as-needed for host modules.

These aren't needed for the target builds because the target uses the
shared RTL.

Change-Id: I3b95c8682c0f63bac6b726f8cd15c638aaa98311
2015-05-12 13:40:26 -07:00
Ying Wang
c63ae628a0 am 480a9bb6: Keep Throwable\'s constructor that takes a String argument.
* commit '480a9bb64e127bff863e6c357d3bd4c3dabfbb57':
  Keep Throwable's constructor that takes a String argument.
2015-05-11 22:31:50 +00:00
Ying Wang
480a9bb64e Keep Throwable's constructor that takes a String argument.
Bug: 20495321
Change-Id: Iaf041da325e1d31f136f36e8ed85b2d90c578b0e
2015-05-11 14:56:20 -07:00
Filip Gruszczynski
8c97e1782b Add percent library to support libraries build.
Change-Id: I8d54f4249f609032fde1d015900204e284fc0c60
2015-05-11 11:58:01 -07:00
Andrew Hsieh
0e0259cca6 Revert "Revert "Enable linker -fix-cortex-a53-843419""
This reverts commit 32e1689684.

Now that prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9 is also updated

Change-Id: Id95c1c4cc651c434461655e62b8f23afd56b53e4
2015-05-11 06:03:07 +00:00
Andres Morales
ea8d0258ea am 821a554c: Merge "[versionitis] pull image id from recovery into props" into mnc-dev
* commit '821a554c1bd1758ba50596f223835a6da3bf6ecf':
  [versionitis] pull image id from recovery into props
2015-05-08 22:30:19 +00:00
Andres Morales
821a554c1b Merge "[versionitis] pull image id from recovery into props" into mnc-dev 2015-05-08 22:04:27 +00:00
Andres Morales
b8876e111e [versionitis] pull image id from recovery into props
- remove root/build.prop, merge with root/default.prop

Change-Id: I913c67d948678745c0bb1b614ac10a0b7488e5c4
2015-05-08 14:46:16 -07:00
Ying Wang
12b3ec7f3a am 90598cb7: Cleaned the outdated incrementaljavac.
* commit '90598cb70c3a6e65223f02c4104e823024caf693':
  Cleaned the outdated incrementaljavac.
2015-05-08 20:50:16 +00:00
Ying Wang
90598cb70c Cleaned the outdated incrementaljavac.
Nobody is using this feature and now we switched to jack.

Change-Id: I749b486eb347cbf3ee7b107565fc800eeb238c44
2015-05-08 13:27:25 -07:00
Ying Wang
1074396120 am d5087784: Merge "Revert "Fix and cleanup."" into mnc-dev
* commit 'd508778493323e5a992110e6990ad120cb9a65c0':
  Revert "Fix and cleanup."
2015-05-08 19:06:28 +00:00
Ying Wang
d508778493 Merge "Revert "Fix and cleanup."" into mnc-dev 2015-05-08 18:51:22 +00:00
Ying Wang
884738e4a6 Revert "Fix and cleanup."
This reverts commit f28bad5227.

Change-Id: Ib64936457a1236fabbe7c6b9c56f52ef650342e7
2015-05-08 18:51:00 +00:00
Ying Wang
d9ac133419 am 22571e18: Merge "Fix and cleanup." into mnc-dev
* commit '22571e18570c01310372261ce5f3dbc7bd3f5616':
  Fix and cleanup.
2015-05-08 18:32:09 +00:00
Ying Wang
22571e1857 Merge "Fix and cleanup." into mnc-dev 2015-05-08 18:11:55 +00:00
Dan Albert
0a4122a4f2 Disallow using stlport.
The only remaining users of stlport are vendor blobs. Prevent any new
users from using it.

Bug: http://b/15193147
Change-Id: I577a16c8c52e2c7d939c3b5026e18ad90e4b9f26
(cherry picked from commit 3a360a7353)
2015-05-08 09:56:48 -07:00
Ying Wang
b12df35b20 am 1af02e61: Merge "Fix Mac build." into mnc-dev
* commit '1af02e61165a989f206395eb7401a0f5316cae42':
  Fix Mac build.
2015-05-08 16:40:01 +00:00
Ying Wang
1af02e6116 Merge "Fix Mac build." into mnc-dev 2015-05-08 03:59:15 +00:00