summaryrefslogtreecommitdiffstats
path: root/core/binary.mk
Commit message (Collapse)AuthorAgeFilesLines
* Use LOCAL_REQUIRED_MODULES to add dependency of installed shared librariesYing Wang2011-09-151-56/+56
| | | | | | | | | | | | Bug: 5200343 Before this change the build system assumes that shared libraries will be installed to $(TARGET_SHARED_LIBRARIES). That's not true if the module uses custom LOCAL_MODULE_PATH. With this change we defer the evaluation of the dependency to after all Android.mks are loaded and all modules have their installed path determined. Change-Id: Ib6628ed44154a90e8668d31691fbbac67125be6c
* Add ABI specific include path for NDK.Ying Wang2011-09-071-1/+2
| | | | Change-Id: I37a935126b9a1e544fc5a7471cf6ca224fc89cf3
* Use the LOCAL_* as dependency.Ying Wang2011-07-131-1/+1
| | | | | | PRIVATE_* should be used only in the build commands. Change-Id: Ie1d8db7c78012a8615b893d3ef3be893da7466f4
* Remove the simulator target from all makefiles.Jeff Brown2011-07-111-5/+1
| | | | | | Bug: 5010576 Change-Id: Ie814f4c8d3aa1e7cc7f5735822ab25542f36cf62
* Allow per module RTTI setting. This fixes a bug in previous check-ins.Doug Kwan2011-06-071-1/+3
| | | | Change-Id: I5fcac192a7945720fd7667f7497078d310370bc5
* Allow enabling RTTI in a module.Doug Kwan2011-05-101-0/+4
| | | | Change-Id: Ie8ce920e3ccb7e53bdf917d8ac5a386df3e7836a
* Add LOCAL_GROUP_STATIC_LIBRARIESYing Wang2011-04-251-0/+6
| | | | | | | | Set LOCAL_GROUP_STATIC_LIBRARIES := true to group the static libraries, in case we need gcc flags "-Wl,--start-group" and "-Wl,--end-group" to fix circular references. Change-Id: I03c4901670112fcdd2bb0fe660b6924e5776fcf8
* Support stl variants when LOCAL_NDK_VERSION is set.Ying Wang2011-03-041-5/+41
| | | | | | | LOCAL_NDK_STL_VARIANT can be set to system, stlport_static, stlport_shared or gnustl_static. It defaults to system. Change-Id: I2840d30ff732a00bc0ea70eab8a8179aea0abbdf
* Add stl include path if LOCAL_NDK_VERSION is setYing Wang2011-02-231-0/+3
| | | | | | Since NDKr5 the stl headers reside in a separate directory. Change-Id: I98f37b593560a1a2a55418f8ba413ca842ed37ef
* am 3be47af9: am b3f59bde: am 86a90364: Merge "core/binary.mk: Add missing ↵David 'Digit' Turner2011-02-151-0/+1
|\ | | | | | | | | | | | | Objective-C objects to the build." * commit '3be47af9491b7fd93b74122cb7f979f2b86c1634': core/binary.mk: Add missing Objective-C objects to the build.
| * core/binary.mk: Add missing Objective-C objects to the build.David 'Digit' Turner2011-02-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason, all_objects was not listing objects generated from objective-C sources. We need these for the emulator (which builds its own version of SDL which uses Quartz on OS X). + Fix a typo in transform-host-m-to-o definition. This also explains why https://review.source.android.com/#change,21074 had to be reverted, since it gets rid of the prebuilt SDL libraries when building the emulator. Change-Id: I173811cf11cdb5b045073aade59364236145bc77
| * Extra protobuf-related supportJean-Baptiste Queru2011-01-271-0/+1
| | | | | | | | Change-Id: I375d32f0bcb695ccb0603743133034941d584163
| * Protobuf compiler support in the build systemJean-Baptiste Queru2011-01-271-5/+43
| |
* | Build system tweaks for Valgrind.Jeff Brown2011-02-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | Added LOCAL_NO_CRT to enable building executables that do not link to the C runtime library. Removed support for LOCAL_MODULE_SUBDIR since it was broken and unused. (Was going to use it but ended up using LOCAL_MODULE_PATH instead.) Change-Id: I3b6f5ab7e5ae6aaa7119899adccece2b4ab1cbb3
* | Allow module-specific protoc flags.Ying Wang2010-11-051-0/+1
| | | | | | | | | | | | You can add local protoc flags via LOCAL_PROTOC_FLAGS. Change-Id: If246a4edafe1edcec6a7f193bde8ce3c83de745b
* | Integrate protocol buffer compiler into the build system.Ying Wang2010-11-021-5/+43
|/ | | | | Bug: 3152546 Change-Id: Ida3ca3d633ce45704dc8e80d044cdbd3ca69aca5
* resolved conflicts for merge of 54ddcc27 to gingerbread-plus-aospJean-Baptiste Queru2010-10-191-0/+6
|\ | | | | | | Change-Id: I336f9e6859dce3bb18224b3340837474319c809c
| * Explicitly declare assembly only __ASSEMBLY__ macro for assembly sourceJim Huang2010-10-141-0/+6
| | | | | | | | | | | | | | | | To isolate the assembly-only macros in header files, such as <machine/cpu-features.h>, this patch attempts to declare assembly only __ASSEMBLY__ macro in build system. Change-Id: I081c3e46258a9256b20995e4d0b473c64745444c
* | am 02c9813a: Prebuilt NDKs are merged for linux and darwin.Ying Wang2010-09-231-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Merge commit '02c9813a726803e1c406b19f6b9dc4e411326e66' into gingerbread-plus-aosp * commit '02c9813a726803e1c406b19f6b9dc4e411326e66': Prebuilt NDKs are merged for linux and darwin.
| * | Prebuilt NDKs are merged for linux and darwin.Ying Wang2010-09-231-1/+1
| | | | | | | | | | | | Change-Id: I0b632d7ba4df5b27dda36280b22dfd0b37e116b7
* | | am ef5bf469: am bce4b75f: Add JNI_H_INCLUDE as default header search pathYing Wang2010-07-221-0/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'ef5bf469fab7166373b10db6c88e6c3cf0e64217' into gingerbread-plus-aosp * commit 'ef5bf469fab7166373b10db6c88e6c3cf0e64217': Add JNI_H_INCLUDE as default header search path
| * | Add JNI_H_INCLUDE as default header search pathYing Wang2010-07-221-0/+4
| | | | | | | | | | | | | | | | | | | | | So that module Android.mk does not need to include it manually. Also with this change, CL like https://android-git.corp.google.com/g/57887 is not needed. Change-Id: I68fa73a00c76eb37a8142f35d7eeef79cf53c09b
* | | am ebf93bb5: am 75b28573: Fix sim build for unbundling native codeYing Wang2010-07-221-0/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'ebf93bb5c4585e783813ed5fcc54fc02b80ea460' into gingerbread-plus-aosp * commit 'ebf93bb5c4585e783813ed5fcc54fc02b80ea460': Fix sim build for unbundling native code
| * | Fix sim build for unbundling native codeYing Wang2010-07-161-0/+4
| | | | | | | | | | | | | | | | | | NDK does not support sim build. Change-Id: I57a09c0083126c57a99cf33c055edef3390d1c28
* | | am f0f60cdd: resolved conflicts for merge of 1a08100f to gingerbreadYing Wang2010-07-131-10/+75
|\ \ \ | |/ / | | / | |/ |/| | | | | Merge commit 'f0f60cdd8f4f74b2480774887606afdebec8d891' into gingerbread-plus-aosp * commit 'f0f60cdd8f4f74b2480774887606afdebec8d891': Support to build native libraries with prebuilt NDK
| * Support to build native libraries with prebuilt NDKYing Wang2010-07-131-10/+75
| | | | | | | | | | Bug: http://b/issue?id=2811253 Change-Id: Iabd4ab8b3d7236dffe89f1939e1142e882944026
* | Set arm specific variables to be empty for non-arm platformsChih-Wei Huang2010-07-091-0/+7
|/ | | | | | | These variables are useless for non-arm platforms, and will generate misleading messages during building process. Change-Id: I37c46ac8d30f353333803d9591b65fca24ce3fd5
* Add FDO options to Android make system.Jing Yu2009-09-211-0/+9
|
* merged 866a6d399e0ec2a0604c3d64e372f827a87ec843 with conflicts in core/binary.mkThe Android Open Source Project2009-05-251-0/+13
|\
| * Allow the build system to build Objective-C sources.David 'Digit' Turner2009-05-201-0/+13
| | | | | | | | | | This is needed to move our modified SDL sources under external/qemu/distrib. As per joeo's request, this change also enables target Objective-C compilation, letting it error at build time.
* | Change PRIVATE to LOCAL for additional dependencies.Patrick Scott2009-05-191-10/+10
| | | | | | | | This change will be used by webcore_test in a separate change.
* | Merge commit '9528248' into masterDave Bort2009-05-051-5/+5
|\ \ | |/ | | | | | | | | | | Conflicts: core/combo/linux-arm.mk Signed-off-by: Dave Bort <dbort@android.com>
| * core: Don't debug native modules when TARGET_BUILD_TYPE==debugDave Bort2009-05-041-5/+5
| | | | | | | | | | | | Don't make the simulator default to debug mode. Remove all global "debug" {C,CPP}FLAGS, which are no longer used.
* | Extend build system to compile generated "C" files.Jack Palevich2009-05-041-0/+18
|/ | | | | | Until now only generated assembly or C++ files would be compiled. This patch extends the build system to compile generated C files as well. The new rule is modeled on the existing rules for compiling generated C++ files and the existing rule for compiling ordinary C files.
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+403
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-399/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-0/+2
|
* Initial ContributionThe Android Open Source Project2008-10-211-0/+397