summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Remove unnecessary 10.8-specific build rules"Stephen Hines2014-10-202-10/+0
|\
| * Remove unnecessary 10.8-specific build rulesStephen Hines2014-10-172-10/+0
| | | | | | | | | | | | | | | | We no longer need gcc for host builds, since those all run through clang. This header include, however, triggers errors about SSE intrinsics by replacing the more relevant include dirs that we should be using. Change-Id: I26a949f0109de8e6e2d1f09cb8127be927549cc4
* | Merge "Fix breakage for x86_64 static executables."Dan Albert2014-10-181-1/+2
|\ \ | |/ |/|
| * Fix breakage for x86_64 static executables.Dan Albert2014-10-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Yikes. Don't know how this slipped through code review. I had actually mentioned a need for cleanup in this part of the build system earlier, since the amount of duplication between transform-o-to-* for each arch means we might fix things incorrectly in one of them (as I've just shown). Similarly, code reviewers are likely to skim each one after the first if they all look close enough (which is presumably what happened here). Change-Id: I9b85914510f0b114485021deb97f42740712aae5
* | Merge "Use libstc++ for the name of bionic's STL."Dan Albert2014-10-171-2/+2
|\ \ | |/ |/|
| * Use libstc++ for the name of bionic's STL.Dan Albert2014-10-161-2/+2
| | | | | | | | | | | | | | It is libstdc++.so, after all, and the naming makes sense for the host this way (since it also uses libstdc++). Change-Id: If37ffa015f7967a928ea47a290363d7696c4ce35
* | Merge "Add LPAE to dex2oat ISA feature list."Ian Rogers2014-10-171-2/+2
|\ \ | |/ |/|
| * Add LPAE to dex2oat ISA feature list.Ian Rogers2014-10-161-2/+2
| | | | | | | | | | | | Bug: 17993736 Change-Id: Ibdf0df017a582d7d807dff17f0392dbf28475e02
* | Merge "Fix Java detection on some Linux distributions"Ying Wang2014-10-161-1/+7
|\ \ | |/ |/|
| * Fix Java detection on some Linux distributionsBernhard Rosenkraenzer2014-10-161-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge "Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level."Ian Rogers2014-10-161-0/+7
|\ \
| * | Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level.Ian Rogers2014-10-151-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Never use stlport on the host.Dan Albert2014-10-161-5/+8
|/ / | | | | | | | | | | LOCAL_CXX_STL := stlport should just use the default STL on the host. Change-Id: Iede1b2d8884e237a10e000e5835addb768c8f78d
* | Link compiler-rt in the correct order.Dan Albert2014-10-146-7/+16
| | | | | | | | | | | | | | | | 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
* | Merge "Remove "-mstackrealign" option from all x86 builds."Elliott Hughes2014-10-136-6/+1
|\ \
| * | Remove "-mstackrealign" option from all x86 builds.Alexander Ivchenko2014-10-136-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge "Introduce per-product per-module dex-preopt config"Ying Wang2014-10-106-3/+52
|\ \ \
| * | | Introduce per-product per-module dex-preopt configYing Wang2014-10-086-3/+52
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added LOCAL_DEX_PREOPT_FLAGS to pass extra flags to dex2oat. - Added macro add-product-dex-preopt-module-config to specify almost arbitrary dex-preopt config/flags to modules in product configuration: $(call \ add-product-dex-preopt-module-config,<module_name_list>,<config_or_flags>) How <config_or_flags> is interpreted is decided by dex_preopt_odex_install.mk and dex2oat. For now if it's "disable" we disable dexpreopt for the given modules; otherwise pass it to dex2oat as command line flags. - If there are multiple configs for the same module in the product inheritance, the first takes precedence. - Added PRODUCT_DEX_PREOPT_DEFAULT_FLAGS so you can specify default dex2oat flags in product configuration. - Added PRODUCT_DEX_PREOPT_BOOT_FLAGS to specify flags of building boot.oat. Bug: 17791867 Change-Id: I1b2955e8e51039e94d1ff43a3265a8d03598632c
* | | Merge "Add -fPIC as default Clang mips ASFLAGS."Chih-Hung Hsieh2014-10-091-0/+1
|\ \ \
| * | | Add -fPIC as default Clang mips ASFLAGS.Chih-Hung Hsieh2014-10-081-0/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | For mips target, gcc passes -KPIC to assembler by default, but clang passes -KPIC only if -fPIC or -fpic is given. BUG: 17895505 Change-Id: I7803adaf8ad7b40c6473872b67f4e0b4c502b38a
* | | LOCAL_NATIVE_COVERAGE should imply -O0.Dan Albert2014-10-081-4/+6
|/ / | | | | | | | | | | Optimization can lead to incorrect coverage results. Change-Id: I8ade9ab246e292d26ac18821baf9970e29dc1a1f
* | Apply LOCAL_CXX_STL to also prebuilts.Ying Wang2014-10-073-65/+75
| | | | | | | | | | | | | | Because LOCAL_CXX_STL modifies a module's required shared libaries, we need this for also prebuilt shared libraries and executables. Change-Id: I418c26143999a613c40aadf990f131b123e0ac3d
* | Fix typo.Nicolas Geoffray2014-10-071-1/+1
| | | | | | | | Change-Id: I738ad878a2961d118b5a89bf7d434606df2fad92
* | Merge "Make which dex2oat version to use configurable."Nicolas Geoffray2014-10-073-4/+11
|\ \
| * | Make which dex2oat version to use configurable.Nicolas Geoffray2014-10-073-4/+11
| | | | | | | | | Change-Id: Ic13cf6f9dfb117193a5101781945c501d138955c
* | | Merge "Stash original values of CC and CXX."Dan Albert2014-10-061-0/+5
|\ \ \
| * | | Stash original values of CC and CXX.Dan Albert2014-10-061-0/+5
| |/ / | | | | | | | | | | | | | | | | | | This way we can still access the real compiler as opposed to a wrapped one. Change-Id: I17ba30416a3eb8eda056c67faaa8b5957e70caea
* | | Remove unused my_compiler_dependencies.Dan Albert2014-10-061-20/+9
|/ / | | | | | | | | | | | | | | my_compiler_dependencies was never assigned to, but the way it was included in the rules prevented the user from being able to use | in LOCAL_ADDITIONAL_DEPENDENCIES. Since it is unneeded, just remove it. Change-Id: I74bb59e81b97756296060eea5b7a42909be50130
* | Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h.Dan Albert2014-10-016-308/+1
|/ | | | Change-Id: If2018529a6c067b63e1a59c16c911d63ec2ebbf4
* Merge "Update prebuilt RS clcore location."Tim Murray2014-09-301-1/+1
|\
| * Update prebuilt RS clcore location.Tim Murray2014-09-301-1/+1
| | | | | | | | Change-Id: Iebf255d7cc093b74e08b1f1378d9b397fd9dd3b9
* | Clear all LOCAL_CLANG_*FLAGS*.Chih-Hung Hsieh2014-09-301-0/+8
|/ | | | | | | | | Although only some of these flags will be used for some targets or hosts, they must all be cleared to avoid carrying over from one project to another. BUG: 17677366 Change-Id: I6d26fa7e5bf2ff11758728810d4874f3759aebe7
* java_alternative_checked_module takes precedence.Ying Wang2014-09-291-4/+2
| | | | | | | java_alternative_checked_module takes precedence over LOCAL_BUILT_MODULE. Change-Id: I84f0d65dbc05f4686817aa835d003eb0101af146
* Don't modify LOCAL_CHECKED_MODULE.Ying Wang2014-09-291-9/+11
| | | | | | | | | | | | | Use a temporary variable my_checked_module instead, so that we don't override the 2nd_arch's checked module with the 1st_arch's in multilib build. Note that by default we checkbuild 2nd_arch only for host modules, but not for target modules. We enable multlib for target modules by default, it would take too much time to checkbuild for both archs. For 32-bit modules actually we can checkbuild a 32-bit product. Change-Id: I0a5ba75699225b7641442673483731a8fd360d61
* Merge "Add local Clang+target specific flags."Chih-Hung Hsieh2014-09-272-0/+20
|\
| * Add local Clang+target specific flags.Chih-Hung Hsieh2014-09-262-0/+20
| | | | | | | | | | BUG: 17677366 Change-Id: I75522fb56fdf4d27ea1f5f0ae15866b13ae6e206
* | Fix detection of C++ STL for tests.Dan Albert2014-09-262-2/+9
| | | | | | | | | | | | | | Target tests weren't approrpiately using the libc++ gtest for libc++_static, and the hosts tests were still using the old check. Change-Id: I13813d5f09673b144b2dfead93eb81cb4bae0e34
* | Merge "Remove unnecessary CLANG_CONFIG_EXTRA_*_C_INCLUDES variables."Stephen Hines2014-09-262-8/+1
|\ \
| * | Remove unnecessary CLANG_CONFIG_EXTRA_*_C_INCLUDES variables.Stephen Hines2014-09-252-8/+1
| | | | | | | | | | | | | | | | | | | | | These aren't needed now that we only use the compiler/headers that exist in the prebuilts/clang directory. Change-Id: I9978efb10815e92577d45629db324e0a5094f880
* | | Merge "Use new variable LLVM_PREBUILTS_VERSION to simplify path construction."Stephen Hines2014-09-261-2/+3
|\ \ \ | |/ / | | / | |/ |/|
| * Use new variable LLVM_PREBUILTS_VERSION to simplify path construction.Lai Wei-Chih2014-09-241-2/+3
| | | | | | | | | | | | | | This removes the hard-coded '3.5' in the various paths and makes switching to a new toolchain easier from the command line (m LLVM_PREBUILTS_VERSION=3.6). Change-Id: I46b10eb2fc177a03528de9c7b433f8647f632081
* | Test __GLIBC__ is defined before using its value.Ian Rogers2014-09-251-1/+1
|/ | | | | | Avoids -Wundef warning. Change-Id: I52d8223500fe31cdf7023e32e96df75e33eb2f7e
* Merge "Add option for generating coverage info."Dan Albert2014-09-2411-9/+59
|\
| * Add option for generating coverage info.Dan Albert2014-09-2311-9/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To enable building with coverage, the environment variable NATIVE_COVERAGE must be set to true. Set `LOCAL_NATIVE_COVERAGE := true` to generate coverage information for a given component. This is currently not supported for clang (b/17574078, b/17583330). If static library A is included in a binary B (dynamic or static executable, or shared library), and A is built with coverage information, B is required to link with libgcov.a. Since the make does not offer a good way to track this dependency, link libgcov.a even if LOCAL_NATIVE_COVERAGE is not set (but still guarded by NATIVE_COVERAGE). This ensures that all of the libgcov dependencies will always be resolved, and causes no change in the resulting binary if coverage is not used. Bug: 10134489 Change-Id: Id5a19f2c215e4be80e6eae27ecc19b582f2f6813
* | Remove unused HAVE_OFF64_T.Elliott Hughes2014-09-238-40/+0
| | | | | | | | Change-Id: I24acf64efcd0fd84d5dda342d4c4293fa59fae1a
* | Remove the unused IPC macros.Elliott Hughes2014-09-228-78/+1
| | | | | | | | | | | | | | There are still a couple of references to HAVE_WIN32_IPC to be dealt with later. Change-Id: Id131fbf2e96d4c1c7bb98629779045375bd5f85f
* | build: remove HAVE_OOM_ADJTodd Poynor2014-09-228-56/+0
| | | | | | | | | | | | This define is no longer used. Change-Id: I6615d6e4aa09f71b7c4c435ccb83a07bba91b6dc
* | Merge "Fix recovery image build for 32p"Ying Wang2014-09-201-6/+6
|\ \
| * | Fix recovery image build for 32pBruce Beare2014-09-151-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building for 32p, we need to be explicit that we wish to build the 32bit version of the binaries that will be placed in the recovery image. The recovery image doesn't actually care... but if we are not explicit in this, the makefiles will ask for the 64bit binaries but the Android.mk for the binaries will supply the 32bit images (causing the build to fail).. Change-Id: I728912bc8e07726888fe8bed4352cbb373911cb7 Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
* | | Merge "Remove unused HAVE_EPOLL."Elliott Hughes2014-09-196-30/+0
|\ \ \