Ian Rogers
7e771594ce
am 0251f345
: am fc82be6e
: Merge "Add LPAE to dex2oat ISA feature list."
...
* commit '0251f3454e5f4716716673f2df1becd0730fbc79':
Add LPAE to dex2oat ISA feature list.
2014-10-17 07:44:19 +00:00
Ian Rogers
ed2783b8c6
am 0251f345
: am fc82be6e
: Merge "Add LPAE to dex2oat ISA feature list."
...
* commit '0251f3454e5f4716716673f2df1becd0730fbc79':
Add LPAE to dex2oat ISA feature list.
2014-10-17 07:44:14 +00:00
Ian Rogers
0251f3454e
am fc82be6e
: Merge "Add LPAE to dex2oat ISA feature list."
...
* commit 'fc82be6e776acfc3d784e61e2026d65417285495':
Add LPAE to dex2oat ISA feature list.
2014-10-17 07:34:45 +00:00
Dan Albert
93e8cf71fc
Use libstc++ for the name of bionic's STL.
...
It is libstdc++.so, after all, and the naming makes sense for the host
this way (since it also uses libstdc++).
Change-Id: If37ffa015f7967a928ea47a290363d7696c4ce35
2014-10-16 21:18:15 -07:00
Ian Rogers
fc82be6e77
Merge "Add LPAE to dex2oat ISA feature list."
2014-10-17 03:56:42 +00:00
Ying Wang
9e3aabb77f
am e453f5fa
: am b3f42ed0
: am 4e3e9ffb
: Merge "Fix Java detection on some Linux distributions"
...
* commit 'e453f5fae32abd147adc1e774fe4290f726e4d97':
Fix Java detection on some Linux distributions
2014-10-16 21:11:54 +00:00
Ying Wang
19f43c18f6
am b3f42ed0
: am 4e3e9ffb
: Merge "Fix Java detection on some Linux distributions"
...
* commit 'b3f42ed09a141b23c0738a828788b3d77d610b4b':
Fix Java detection on some Linux distributions
2014-10-16 21:09:06 +00:00
Ying Wang
e453f5fae3
am b3f42ed0
: am 4e3e9ffb
: Merge "Fix Java detection on some Linux distributions"
...
* commit 'b3f42ed09a141b23c0738a828788b3d77d610b4b':
Fix Java detection on some Linux distributions
2014-10-16 21:08:12 +00:00
Ying Wang
b3f42ed09a
am 4e3e9ffb
: Merge "Fix Java detection on some Linux distributions"
...
* commit '4e3e9ffbf314500d303724aefbddf1b89094cfd8':
Fix Java detection on some Linux distributions
2014-10-16 21:03:04 +00:00
Ying Wang
4e3e9ffbf3
Merge "Fix Java detection on some Linux distributions"
2014-10-16 20:58:37 +00:00
Ian Rogers
b55201f2b6
am 7cbe40ef
: am defe864a
: am 07b212ac
: Merge "Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level."
...
* commit '7cbe40efbb192f52ac27d9d6cebe01d465704058':
Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level.
2014-10-16 20:16:29 +00:00
Ian Rogers
7cbe40efbb
am defe864a
: am 07b212ac
: Merge "Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level."
...
* commit 'defe864ab6f971efc00328cee5ea3cb1d69d377d':
Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level.
2014-10-16 20:13:11 +00:00
Ian Rogers
1bd593ca0b
am defe864a
: am 07b212ac
: Merge "Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level."
...
* commit 'defe864ab6f971efc00328cee5ea3cb1d69d377d':
Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level.
2014-10-16 20:13:05 +00:00
Ian Rogers
defe864ab6
am 07b212ac
: Merge "Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level."
...
* commit '07b212ac59f0018a01ad3262caa0b96b9aff30a1':
Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level.
2014-10-16 20:07:27 +00:00
Ian Rogers
6825e3c9db
Add LPAE to dex2oat ISA feature list.
...
Bug: 17993736
Change-Id: Ibdf0df017a582d7d807dff17f0392dbf28475e02
2014-10-16 13:07:05 -07:00
Ian Rogers
07b212ac59
Merge "Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level."
2014-10-16 20:02:26 +00:00
Dan Albert
190de301e5
am 82f3ae77
: am 8a47f6d3
: am f2bdac77
: Merge "Never use stlport on the host."
...
* commit '82f3ae778e0eb6d5de134d19c0a23c7f04e5b540':
Never use stlport on the host.
2014-10-16 18:18:21 +00:00
Dan Albert
82f3ae778e
am 8a47f6d3
: am f2bdac77
: Merge "Never use stlport on the host."
...
* commit '8a47f6d3192140646d0d057c371b17e487fc2a77':
Never use stlport on the host.
2014-10-16 18:10:22 +00:00
Dan Albert
ad1891d1e9
am 8a47f6d3
: am f2bdac77
: Merge "Never use stlport on the host."
...
* commit '8a47f6d3192140646d0d057c371b17e487fc2a77':
Never use stlport on the host.
2014-10-16 18:10:15 +00:00
Dan Albert
8a47f6d319
am f2bdac77
: Merge "Never use stlport on the host."
...
* commit 'f2bdac77b1d99abb190253f386cc6ffe4ffbeaca':
Never use stlport on the host.
2014-10-16 18:05:33 +00:00
Dan Albert
b49987e2f8
Never use stlport on the host.
...
LOCAL_CXX_STL := stlport should just use the default STL on the host.
Change-Id: Iede1b2d8884e237a10e000e5835addb768c8f78d
2014-10-16 09:53:51 -07:00
Bernhard Rosenkraenzer
311384fec3
Fix Java detection on some Linux distributions
...
On some Linux distributions (spotted here on OpenMandriva Lx, but I'm
pretty sure some others do the same thing), "which javac" returns
/usr/bin/javac, which is a symlink to "../../etc/alternatives/javac",
which in turn points at whatever the JDK the user picked as his default.
Given "../../etc/alternatives/javac" is a relative symlink, the next
iteration of LSLINE=$(ls -l "$JAVAC") fails (no ../../etc/alternatives/java
relative to the build directory), causing tools.jar not to be found.
Using realpath and readlink where possible should work in all cases.
Change-Id: Ic60ac84a5b263dc1c1f2960092a7549d1024ed2e
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org >
2014-10-16 14:08:32 +02:00
Ian Rogers
63e551f0ae
Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level.
...
LPAE indicates better instructions can be used when atomicity guarantees are
needed. However, LPAE's presence isn't advertised by clang/GCC. We fake an
ARM feature to advertise its presence on architectures where it is.
Also, add a TODO documenting that cortex-a15 is not the correct CPU variant
for krait.
Change-Id: I02a1248025c32d94eca0bc8a249dc524f1ac9c36
2014-10-15 15:44:16 -07:00
Stuart Scott
decb2fb4d4
am ff8f66dc
: am 3c0190ff
: am f06c6eff
: Add abi to generated XML
...
* commit 'ff8f66dcc8735f2de2eb788365fc6dfec5eafc82':
Add abi to generated XML
2014-10-15 03:06:56 +00:00
Stuart Scott
ff8f66dcc8
am 3c0190ff
: am f06c6eff
: Add abi to generated XML
...
* commit '3c0190ff5bc74ba7102691b3e2db3c867a2e2442':
Add abi to generated XML
2014-10-15 02:30:59 +00:00
Dan Albert
1b756930a2
am a8abcb36
: resolved conflicts for merge of 852fc3e6
to lmp-mr1-dev-plus-aosp
...
* commit 'a8abcb365b8ea94c7672b09e851488d9454135ba':
Link compiler-rt in the correct order.
2014-10-15 00:22:43 +00:00
Stuart Scott
3c0190ff5b
am f06c6eff
: Add abi to generated XML
...
* commit 'f06c6eff656f6bf0ac06662ef21e29e446e1a43d':
Add abi to generated XML
2014-10-15 00:22:35 +00:00
Dan Albert
b0d324aadd
Merge "resolved conflicts for merge of 852fc3e6
to lmp-dev-plus-aosp" into lmp-dev-plus-aosp
2014-10-15 00:19:06 +00:00
Stuart Scott
3e65583ef7
am f06c6eff
: Add abi to generated XML
...
* commit 'f06c6eff656f6bf0ac06662ef21e29e446e1a43d':
Add abi to generated XML
2014-10-15 00:18:37 +00:00
Dan Albert
a8abcb365b
resolved conflicts for merge of 852fc3e6
to lmp-mr1-dev-plus-aosp
...
Change-Id: I9809c14b2f9ffb539272aba66d3a27d8107b81ea
2014-10-14 17:17:22 -07:00
Dan Albert
ae66eba6f3
resolved conflicts for merge of 852fc3e6
to lmp-dev-plus-aosp
...
Change-Id: If3de742dcd2157c4690ae0eb34494dc11492054f
2014-10-14 17:15:17 -07:00
Stuart Scott
f06c6eff65
Add abi to generated XML
...
bug:17881028
Change-Id: I6dd37e99c0f511d8c883cb8128ea743c2e21f6ad
2014-10-15 00:10:08 +00:00
Dan Albert
852fc3e69c
am c131ec09
: Merge "Link compiler-rt in the correct order."
...
* commit 'c131ec09d9ffb92473c4162c92c0646d6e731b0c':
Link compiler-rt in the correct order.
2014-10-15 00:05:35 +00:00
Dan Albert
e1b17e7ef5
Link compiler-rt in the correct order.
...
The compiler run-time library should always be the _last_ thing linked
when building static executables. This was being done correctly for
libgcc, but not when using compiler-rt.
Change-Id: I0689dc35f55caad2fe74c0cbb4cbe3008ded349a
2014-10-14 10:45:33 -07:00
Elliott Hughes
e86ee5e707
am 9b5e64a8
: am 33f33371
: am 165fdf42
: Merge "Remove "-mstackrealign" option from all x86 builds."
...
* commit '9b5e64a80878131dbf1e78d92565f4c39bff5c63':
Remove "-mstackrealign" option from all x86 builds.
2014-10-13 23:18:17 +00:00
Elliott Hughes
9b5e64a808
am 33f33371
: am 165fdf42
: Merge "Remove "-mstackrealign" option from all x86 builds."
...
* commit '33f33371cdef7d8faa9f39cd4902698856c0bb64':
Remove "-mstackrealign" option from all x86 builds.
2014-10-13 22:45:43 +00:00
Elliott Hughes
337dd2e637
am 33f33371
: am 165fdf42
: Merge "Remove "-mstackrealign" option from all x86 builds."
...
* commit '33f33371cdef7d8faa9f39cd4902698856c0bb64':
Remove "-mstackrealign" option from all x86 builds.
2014-10-13 22:45:42 +00:00
Elliott Hughes
33f33371cd
am 165fdf42
: Merge "Remove "-mstackrealign" option from all x86 builds."
...
* commit '165fdf42042d7c13d9f7866b3a3eff841e08dad2':
Remove "-mstackrealign" option from all x86 builds.
2014-10-13 22:41:47 +00:00
Elliott Hughes
165fdf4204
Merge "Remove "-mstackrealign" option from all x86 builds."
2014-10-13 22:35:59 +00:00
Alexander Ivchenko
ae2d47a47f
Remove "-mstackrealign" option from all x86 builds.
...
For ndk docs change, please refer to:
https://android-review.googlesource.com/#/c/110100/
Change-Id: I8428e7a979eb02441066aeeee43ce693d4d0dc8d
Signed-off-by: Alexander Ivchenko <alexander.ivchenko@intel.com >
2014-10-13 19:08:01 +04:00
Raphael Moll
4e2722f717
am f70f3673
: am 5abf8bf2
: am a4d1f6a7
: SDK Addon multi-sys-img support.
...
* commit 'f70f3673d5325cd8405478fe0bc21a6d530796b6':
SDK Addon multi-sys-img support.
2014-10-10 21:29:33 +00:00
Ying Wang
b63d8cf8c3
am e2331e9f
: am 36cff2a9
: am edb9df24
: Merge "Check to determine if we can run dex-preopt." into lmp-dev
...
* commit 'e2331e9f2cb17a859905fd8a6ce447af68198868':
Check $(built_dex) to determine if we can run dex-preopt.
2014-10-10 18:41:58 +00:00
Raphael Moll
f70f3673d5
am 5abf8bf2
: am a4d1f6a7
: SDK Addon multi-sys-img support.
...
* commit '5abf8bf25743ed95f9a3bb6bf4702d2042667c59':
SDK Addon multi-sys-img support.
2014-10-10 17:16:08 +00:00
Ying Wang
e2331e9f2c
am 36cff2a9
: am edb9df24
: Merge "Check to determine if we can run dex-preopt." into lmp-dev
...
* commit '36cff2a9963d593da831684b5cfbb9ce73dd9c27':
Check $(built_dex) to determine if we can run dex-preopt.
2014-10-10 16:58:03 +00:00
Raphael Moll
5abf8bf257
am a4d1f6a7
: SDK Addon multi-sys-img support.
...
* commit 'a4d1f6a7f0399b5e5e38b7c6f274f5fb11be48b9':
SDK Addon multi-sys-img support.
2014-10-10 15:17:16 +00:00
Raphael Moll
8d28a2c044
am a4d1f6a7
: SDK Addon multi-sys-img support.
...
* commit 'a4d1f6a7f0399b5e5e38b7c6f274f5fb11be48b9':
SDK Addon multi-sys-img support.
2014-10-10 14:34:31 +00:00
Ying Wang
ea2f063f81
am ca3641d6
: resolved conflicts for merge of 3907c03e
to lmp-mr1-dev-plus-aosp
...
* commit 'ca3641d600007177542c46358e1cff069adcf95b':
Introduce per-product per-module dex-preopt config
2014-10-10 02:45:52 +00:00
Ying Wang
ca3641d600
resolved conflicts for merge of 3907c03e
to lmp-mr1-dev-plus-aosp
...
Change-Id: I6900c8cdf1d161fbcede73547fad1750df9abab6
2014-10-09 19:31:56 -07:00
Ying Wang
8755756f26
resolved conflicts for merge of 3907c03e
to lmp-dev-plus-aosp
...
Change-Id: I580ab0693609ff506da7346548a45322000114d1
2014-10-09 19:29:53 -07:00
Ying Wang
3907c03e24
am f1794738
: Merge "Introduce per-product per-module dex-preopt config"
...
* commit 'f1794738b178c22bd7f05348f2a393cdec23ade4':
Introduce per-product per-module dex-preopt config
2014-10-10 02:19:10 +00:00