summaryrefslogtreecommitdiffstats
path: root/core/binary.mk
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | Add local Clang+target specific flags.Chih-Hung Hsieh2014-09-261-0/+4
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | BUG: 17677366 Change-Id: I75522fb56fdf4d27ea1f5f0ae15866b13ae6e206
* | | | | | am 145eddfd: am 670018fd: Merge "Remove unnecessary ↵Stephen Hines2014-09-261-2/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CLANG_CONFIG_EXTRA_*_C_INCLUDES variables." * commit '145eddfd229b118fadd4f4f255dbecc1a79b5e2b': Remove unnecessary CLANG_CONFIG_EXTRA_*_C_INCLUDES variables.
| * | | | | Remove unnecessary CLANG_CONFIG_EXTRA_*_C_INCLUDES variables.Stephen Hines2014-09-251-2/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These aren't needed now that we only use the compiler/headers that exist in the prebuilts/clang directory. Change-Id: I9978efb10815e92577d45629db324e0a5094f880
* | | | | resolved conflicts for merge of 326f9450 to lmp-mr1-dev-plus-aospDan Albert2014-09-241-0/+26
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: I10e578a3d10a03312cbc4058a92f02ccaba1739c
| * | | | Add option for generating coverage info.Dan Albert2014-09-231-0/+26
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am 92421720: am 98f7742a: Merge "Move selection of C++ STL into the build ↵Dan Albert2014-09-191-5/+61
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | system." * commit '9242172094691c7203ba7cf0a5e5db611ca9032b': Move selection of C++ STL into the build system.
| * | Move selection of C++ STL into the build system.Dan Albert2014-09-181-5/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preparing for migration from stlport to libc++. STL selection is done with LOCAL_CXX_STL (valid values are default, none, libc++, libc++_static, stlport, stlport_static, bionic). The selection of the STL is as follows: if LOCAL_CXX_STL == 'default' ifdef LOCAL_SDK_VERSION Use whatever STL the other NDK options have selected. else Use bionic's libstdc++ for target, GNU libstdc++ for host. This is compatible with the existing build options. endif else if LOCAL_CXX_STL == 'stlport' Use stlport. else if LOCAL_CXX_STL == 'libc++' Use libc++. else if LOCAL_CXX_STL == '' Don't use any STL. endif endif Bug: 15193147 Change-Id: If712ba0ae7908d8147a69e29da5c453a183d6540
* | | am acaada12: Use existing my_32_64_bit_suffix.Ying Wang2014-09-101-4/+2
|\ \ \ | | |/ | |/| | | | | | | * commit 'acaada12731639e3feba1dd83d7e44765ec8556c': Use existing my_32_64_bit_suffix.
| * | Use existing my_32_64_bit_suffix.Ying Wang2014-09-101-4/+2
| | | | | | | | | | | | Change-Id: I75d9733870c37a44ce55ae6cbcfb3f67e1387e9d
* | | am fabd3c00: Merge "Pass -m32 or -m64 to llvm-rs-cc when reflecting C++." ↵Tim Murray2014-09-101-0/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | into lmp-dev * commit 'fabd3c00b461c921cb745acd62e7b07b4e938241': Pass -m32 or -m64 to llvm-rs-cc when reflecting C++.
| * | Pass -m32 or -m64 to llvm-rs-cc when reflecting C++.Tim Murray2014-09-101-0/+4
| | | | | | | | | | | | | | | | | | bug 17417839 Change-Id: Iea4aede874f751ac732c3e3ae7a11e18613edcf5
* | | am 2202dc0a: am 1051d5dc: Merge "Add LOCAL_CLANG_*FLAGS for clang only flags."Chih-Hung Hsieh2014-09-051-0/+4
|\ \ \ | | |/ | |/| | | | | | | * commit '2202dc0af3ab86e2a73bf816012aaea65fb93d91': Add LOCAL_CLANG_*FLAGS for clang only flags.
| * | Add LOCAL_CLANG_*FLAGS for clang only flags.Chih-Hung Hsieh2014-09-041-0/+4
| | | | | | | | | | | | | | | | | | To be used only for some modules. Change-Id: I107ec37f11f738f860598f0c86c4ad7ec20c9011
* | | am 2d83365c: Merge "Add TARGET_FDO_LDFLAGS to make sure -lgcc is always ↵Dehao Chen2014-08-211-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | linked after -lgcov." into lmp-dev * commit '2d83365c9d852874bee790e2047178959933133e': Add TARGET_FDO_LDFLAGS to make sure -lgcc is always linked after -lgcov.
| * | Add TARGET_FDO_LDFLAGS to make sure -lgcc is always linked after -lgcov.Dehao Chen2014-08-201-1/+1
| | | | | | | | | | | | Change-Id: I33a94abe58391a8564ada14417b0158ddd7ed2d6
* | | am 473dc3d4: am be0af1f7: Merge "Strip my_clang on assignment."Dan Albert2014-08-181-6/+6
|\ \ \ | | |/ | |/| | | | | | | * commit '473dc3d416a29371085237c26f5df391d9698ec1': Strip my_clang on assignment.
| * | Strip my_clang on assignment.Dan Albert2014-08-181-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were a few cases that my_clang was being used without being stripped. This was causing uses like the following to fail because it would be partially applied (use clang as the compiler, but don't strip out incompatible cflags). LOCAL_CLANG := true # explanation To avoid this problem in the future, just strip my_clang when it is assigned. Change-Id: I41c2f36a4d4c3aa305a25b4a151c066dad5ffe0f
* | | am 5b81106e: Merge "Explicitly check if LOCAL_FDO_SUPPORT is true (instead ↵Dehao Chen2014-08-151-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | of empty). Change-Id: Icff260c7f866236254091b035782607a31e5a109" into lmp-dev * commit '5b81106eb5c5c9a616874caae5ea91b45a45e9d6': Explicitly check if LOCAL_FDO_SUPPORT is true (instead of empty). Change-Id: Icff260c7f866236254091b035782607a31e5a109
| * | Explicitly check if LOCAL_FDO_SUPPORT is true (instead of empty).Dehao Chen2014-08-141-1/+1
| | | | | | | | | | | | Change-Id: Icff260c7f866236254091b035782607a31e5a109
| * | Fix Windows SDK build.Dan Albert2014-08-081-0/+5
| | | | | | | | | | | | | | | | | | Bug: 16823325 Change-Id: Ia2a318957aa525f0e72b556a693a20f513146b64 (cherry picked from commit 95994def18dbf2672040105fb61f17b57e8b7fe4)
| * | Inhibit implicit -Bsymolic in -shared.Dan Albert2014-08-081-0/+1
| | | | | | | | | | | | | | | | | | | | | Bug: 16853291 Change-Id: Id70488b077256a70137c4417f21be2c2d1d4341c (cherry picked from commit b6bb71b85d506dcc4763290d72c4168afd541f7d)
| * | Fix uses of -fPIC and -fPIE.Dan Albert2014-08-081-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We've been using -fPIC and -fPIE together in the global cflags all this time. These options are incompatible. The only reason we haven't been hit by this before is because of the forced -Bsymbolic in GCC. To fix this, pass -fpic when compiling objects for shared libraries and -fpie when compiling objects for executables. For static libraries, also use -fpic. We have to do this because static libraries might be included in either a shared library or an executable. Code compiled with -fpie cannot be included in a shared library, but code compiled with -fpic may be included in an executable. We've also been using -fpic and -fPIC together. These are different options, and only the latter will take effect. http://stackoverflow.com/a/967010 The final thing this fixes is that we had -f(PIC|PIE) flags being passed to link commands. These are compile time flags, and don't do anything at link time. Bug: 16823325 Change-Id: Ic76f47e63dc2c81b7e1a8058bae1b3dc8565d606 (cherry picked from commit 4803ce2696950f8c27c83de4fe46ae196f35af16)
| * | Refactor FDO support code to ensure arm64 can also be built with FDO.Dehao Chen2014-07-231-1/+0
| | | | | | | | | | | | Change-Id: I752c9f411b0a046a15c72b4837efc1fb0503b470
* | | am 68301526: am b771d956: Merge "Add flag to enable default clang ↵Tim Murray2014-08-131-0/+7
|\ \ \ | | |/ | |/| | | | | | | | | | | | | builds--USE_CLANG_PLATFORM_BUILD." * commit '6830152675bf4daa9c118c686bf522498c4df3a3': Add flag to enable default clang builds--USE_CLANG_PLATFORM_BUILD.
| * | Add flag to enable default clang builds--USE_CLANG_PLATFORM_BUILD.Tim Murray2014-08-131-0/+7
| | | | | | | | | | | | | | | | | | bug 17007253 Change-Id: Ib11c017bf8aee384e6780e2a1252221fbff3327a
* | | am 8ac188ff: am 6dbbb159: Merge "Consistent use of USE_MINGW"Ying Wang2014-08-081-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '8ac188ff0e739ea75ea02166c54428245200f088': Consistent use of USE_MINGW
| * | Consistent use of USE_MINGWYing Wang2014-08-071-1/+1
| | | | | | | | | | | | Change-Id: I05e212e5a99639d0196006b9c2ec35072c54f399
* | | am 868b22dd: am 76c942c1: Merge "Fix Windows SDK build."Dan Albert2014-08-081-0/+5
|\ \ \ | |/ / | | | | | | | | | * commit '868b22dd277392cce899d9a980270fbaf8d2f9de': Fix Windows SDK build.
| * | Fix Windows SDK build.Dan Albert2014-08-071-0/+5
| | | | | | | | | | | | Change-Id: Ia2a318957aa525f0e72b556a693a20f513146b64
* | | am e99d8947: am cbc742a1: Merge "Inhibit implicit -Bsymolic in -shared."Dan Albert2014-08-081-0/+1
|\ \ \ | |/ / | | | | | | | | | * commit 'e99d8947c09731d71db7e95a280cf81f51f4049a': Inhibit implicit -Bsymolic in -shared.
| * | Inhibit implicit -Bsymolic in -shared.Dan Albert2014-08-071-0/+1
| | | | | | | | | | | | | | | | | | Bug: 16853291 Change-Id: Id70488b077256a70137c4417f21be2c2d1d4341c
* | | am 897cd3d4: am afae9fd8: Merge "Fix uses of -fPIC and -fPIE."Dan Albert2014-08-081-0/+6
|\ \ \ | |/ / | | | | | | | | | * commit '897cd3d494272b8a6a12f0fb6d02bfe7426a309c': Fix uses of -fPIC and -fPIE.
| * | Fix uses of -fPIC and -fPIE.Dan Albert2014-08-071-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We've been using -fPIC and -fPIE together in the global cflags all this time. These options are incompatible. The only reason we haven't been hit by this before is because of the forced -Bsymbolic in GCC. To fix this, pass -fpic when compiling objects for shared libraries and -fpie when compiling objects for executables. For static libraries, also use -fpic. We have to do this because static libraries might be included in either a shared library or an executable. Code compiled with -fpie cannot be included in a shared library, but code compiled with -fpic may be included in an executable. We've also been using -fpic and -fPIC together. These are different options, and only the latter will take effect. http://stackoverflow.com/a/967010 The final thing this fixes is that we had -f(PIC|PIE) flags being passed to link commands. These are compile time flags, and don't do anything at link time. Bug: 16823325 Change-Id: Ic76f47e63dc2c81b7e1a8058bae1b3dc8565d606
* | | am d161be2d: am 77d93bce: Merge "fix build"Tim Murray2014-07-251-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit 'd161be2d063565ecab6d1fce4440d496d8928abc': fix build
| * | fix buildTim Murray2014-07-241-1/+1
| | | | | | | | | | | | Change-Id: I28799d5523e1d2d2500a82b3d323c58486aacdbc
* | | am eb9563f9: am 16d43086: Merge "Fix Windows SDK build to not use clang."Tim Murray2014-07-251-3/+5
|\ \ \ | |/ / | | | | | | | | | * commit 'eb9563f9ab610ca09bf99c6975f70c14c35683bd': Fix Windows SDK build to not use clang.
| * | Fix Windows SDK build to not use clang.Tim Murray2014-07-241-3/+5
| | | | | | | | | | | | | | | | | | bug 16172793 Change-Id: I7bf76cae49ec17bf50eb657b0e38234b7cb55e85
* | | resolved conflicts for merge of 2812b27c to lmp-dev-plus-aospTim Murray2014-07-241-0/+8
|\ \ \ | |/ / | | | | | | Change-Id: I770fbf16affbd43b0750b50426298038e4b573b7
| * | Switch host builds to use Clang by default.Tim Murray2014-07-241-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If LOCAL_CLANG is not set to false for a host module, clang will be used instead of gcc. This also enables the integrated assembler by default for Darwin host builds. bug 16172793 Change-Id: If7484c5dbcccce7d925bec97bff0a3e4c30e9434
* | | am ebe0bacc: am 6837ac67: Merge "Refactor FDO support code to ensure arm64 ↵Ying Wang2014-07-231-1/+0
|\ \ \ | |/ / | | / | |/ |/| | | | | can also be built with FDO." * commit 'ebe0bacc8063f74da5bacb80c5e0b97a00a7351c': Refactor FDO support code to ensure arm64 can also be built with FDO.
| * Refactor FDO support code to ensure arm64 can also be built with FDO.Dehao Chen2014-07-231-1/+0
| | | | | | | | Change-Id: I752c9f411b0a046a15c72b4837efc1fb0503b470
* | am dceddd91: am 79b46720: am 02f98a26: Merge "Fix loophole in module expansion."Ying Wang2014-06-111-1/+1
|\ \ | |/ | | | | | | * commit 'dceddd91d9a6516346e752b9f942747bea931cfa': Fix loophole in module expansion.
| * Fix loophole in module expansion.Ying Wang2014-06-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we only expanded product_MODULES with LOCAL_REQUIRED_MODULES, but not modules introduced by LOCAL_SHARED_LIBRARIES; Later we did a further shared libary expansion in vendor_module_check.mk. It couldn't track C in the following case: A : B, by LOCAL_SHARED_LIBRARIES; B : C, by LOCAL_REQUIRED_MODULES. With this change, we transformed the LOCAL_SHARED_LIBRARIES dependencies into LOCAL_REQUIRED_MODULES dependencies before doing the required module expansion and the loophole is closed. All module names are now expanded to product_MODULES now and it makes vendor_module_check.mk simpler. Change-Id: I8835a478d2ce0ce10601a8449f446f07b01c2b7f
* | am fe9ad097: am b1f65358: am 5ad17493: Merge "Support .asm being compiled by ↵Ying Wang2014-06-111-0/+13
|\ \ | |/ | | | | | | | | | | yasm targeted for x86." * commit 'fe9ad0975ade10219a5fa9a77d034ba77735e393': Support .asm being compiled by yasm targeted for x86.
| * Merge "Support .asm being compiled by yasm targeted for x86."Ying Wang2014-06-091-0/+13
| |\
| | * Support .asm being compiled by yasm targeted for x86.Ying Wang2014-06-061-0/+13
| | | | | | | | | | | | Change-Id: Icd6626a082facf920b0e49e2fbe8861e94400552
* | | am 69d5bd7c: am e266873b: am 1a8f0d3b: Merge "Move comment out of recipe ↵Stephen Hines2014-06-061-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | section" * commit '69d5bd7cbc873c86685c463ac3dc7ab8de9e71e7': Move comment out of recipe section
| * | Move comment out of recipe sectionStephen Hines2014-06-061-2/+2
| |/ | | | | | | | | | | | | If we keep a comment in the recipe, it prints out whenever that component gets built. Change-Id: Idb99a9edc02cfb87e35e59b7fd37588b928b98a5
* | am 834ec0ea: am d3ddfdf8: am b3bed595: Merge "Add a dummy build recipe for ↵Ying Wang2014-05-281-1/+3
|\ \ | |/ | | | | | | | | | | generated RS cpp files." * commit '834ec0ead591cf64a5f660af0210e95728e08c4f': Add a dummy build recipe for generated RS cpp files.
| * Add a dummy build recipe for generated RS cpp files.Ying Wang2014-05-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Previously the RS cpp files are generated by the timestamp rule. Though we have the generated RS cpp files depend on the timestamp file, we don't have a build recipe. In such case gmake does some "optimization" that it skip recompiling the generated cpp files, because it assumes the generated cpp files are already up to date even if the rs files have been updated. Bug: 15313144 Change-Id: Ie69ecd2c788057d3619f9c7d2a125d44c4a534a1