summaryrefslogtreecommitdiffstats
path: root/core/main.mk
Commit message (Collapse)AuthorAgeFilesLines
* Remove the hacks needed to support ash and mksh concurrently.Elliott Hughes2013-11-051-2/+0
| | | | | | | We no longer have ash, and we'd rather not have unnecessary symbolic links on the system. Change-Id: Icfb1a51f1baaf1861c203f6ed93843b094deb65d
* Remove unnecessary dependencies between host and target modules.Ying Wang2013-09-181-1/+11
| | | | | | | | | With this change, modules introduced by LOCAL_REQUIRED_MODULES will be split by host/target: target modules only depend on target modules and host modules only depend on host modules. Bug: 9303948 Change-Id: I4078a7983aa3c00e99534f3f170dfe4b66b12287
* Dist static Java library modules.Ying Wang2013-06-121-1/+6
| | | | | | | | With this change, we can build and dist static jar files, as well as apks. Bug: 9386024 Change-Id: Iab4660d8dfd7a2d164714a2124445de298075901
* Do vendor check on modules installed by LOCAL_SHARED_LIBRARIESYing Wang2013-04-151-2/+2
| | | | | | | | | Since commit 6c86a1 we have split LOCAL_SHARED_LIBRARIES out of LOCAL_REQUIRED_MODULES and the vendor check does no longer cover the installed modules introduced by LOCAL_SHARED_LIBRARIES. This change brings back the coverage. Change-Id: Ie78692e48f173a3350792eb2fee8127ff9433caa
* Support to build vendor.imgYing Wang2013-03-251-0/+4
| | | | | Bug: 8341435 Change-Id: I2db7970936984d38aed35054e3f695d298f4e512
* resolved conflicts for merge of a3aea5b6 to jb-mr2-devRaphael Moll2013-03-141-2/+2
|\ | | | | | | Change-Id: I4ff0adb3f9d9b5ae293c4903569e871ac5f2e9ae
| * Build SDK using prebuilts/devtools.Raphael Moll2013-03-131-2/+2
| | | | | | | | | | | | | | | | | | Cleans up some unused/renamed files: - sdk_only_whitelist is better named windows_sdk_whitelist. - a few product.mk dependencies should not be listed here any more but in the sdk/product.mk instead (which they were.) Change-Id: Ifad3049321c8ec4edd8b94b83e570eebba442e7d
| * Remove nonexisting module names.Ying Wang2013-03-071-1/+1
| | | | | | | | Change-Id: I825de45f1b982e4aa391b11bf18ba90432272fa7
| * Don't install all host modules by default.Ying Wang2013-03-061-3/+0
| | | | | | | | | | | | | | | | | | Instead we should explicitly set up the dependency, if the module will be used in the build process; Use LOCAL_MODULE_TAGS with eng, debug or tests if the module is for testing; or add to PRODUCT_PACKAGES if it's required by a product. Change-Id: Ic26319c26c1166bc1062dfbcfb4e006af185249a
* | Allow to call dist-for-goals multiple times for the same fileYing Wang2013-03-011-8/+0
| | | | | | | | | | | | | | | | | | | | You can dist the same file for multiple goals in multiple calls to dist-for-goals. The first call will establish the real copy rule, while the rest call just establishes the goals' dependency on the dest file. This enable uss to remove the bizarre $(if ..) enclosing the droid and sdk dist while avoiding make's multiple rules warning. Change-Id: I76475db76a9e6167e0e606dd582b54e80dfcdd22
* | am 757e212c: am 0426da29: Merge "Fixed error message for using OpenJDK."Jean-Baptiste Queru2013-02-251-3/+11
|\ \ | |/ | | | | | | * commit '757e212ca2eb5584efb1631c3b26241ffb06e3c6': Fixed error message for using OpenJDK.
| * Fixed error message for using OpenJDK.Tim Roes2013-02-231-3/+11
| | | | | | | | | | | | | | | | | | | | | | Output a meaningful error message, when OpenJDK is detected instead of giving the "wrong java version" output. That output confused several users (from experiences in IRC) since it gives you an output like "You are using java version 1.6.0, right version would be Java SE 1.6". Change-Id: I31ceeb03f1f98524b2b7de9b8be45231985fdb9e Signed-off-by: Tim Roes <tim.roes88@googlemail.com>
* | Don't run cleanspecs if you are using mm/mmm.Ying Wang2013-02-221-1/+1
| | | | | | | | | | | | | | | | There is lurky bug in the previous logic I believe: in rare cases, people saw almost all cleansteps rerun. Anyway, it's very rare that you need to run cleansteps when you run mm/mmm. Change-Id: I42e84b3bf01590712ba1b167fe9a500f4ae1ddde
* | Untwist the target/host shared library dependencies.Ying Wang2013-02-221-2/+15
| | | | | | | | | | | | | | | | Before this, if there are duplicate module names in both the host and target spaces, LOCAL_SHARED_LIBRARIES results in mixed dependencies. Bug: 7026946 Change-Id: I5407e3d078a8903c94978cc6d3e256851c52340f
* | Support for ANDROID_BUILD_EVERYTHING_BY_DEFAULTYing Wang2013-02-211-2/+8
| | | | | | | | | | | | | | Set ANDROID_BUILD_EVERYTHING_BY_DEFAULT to true to build everything by default. You can set it in your .bashrc or buildspec.mk. Change-Id: I0bc2461d0e17c63a6f1c439cdfaaa94e36483a02
* | mma and mmmaYing Wang2013-02-081-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | augmented mm/mmm: Their usages are the same as mm/mmm. They build not only all modules in given path(s), but also their dependencies. With them, to run mm/mmm you don't need to run a full build first now: Just run mma/mmma first. Note that mma/mmma need to load all the makefiles in the source tree so they are much slower than mm/mmm. You should run mma/mmma the first time, and then mm/mmm for incremental build. Bug: 8163814 Change-Id: I554a97c0a23343b65c50870406225eb0064e0651
* | Refactor calculation LOCAL_CHECKED_MODULEYing Wang2013-01-301-1/+1
| | | | | | | | | | | | | | To remove dup code; Also added two more umbrella targets: host, target. Change-Id: Ia6deed2940a26a31ad823fe54816840861f3fb72
* | Revert "Refactor calculation LOCAL_CHECKED_MODULE"Ying Wang2013-01-301-1/+1
| | | | | | | | | | | | This reverts commit ba99e69424b72ac95581da50c8eea131d398d790 Change-Id: I3c42dea56376d26a5bb77b4944ae17a6875aadbb
* | Refactor calculation LOCAL_CHECKED_MODULEYing Wang2013-01-301-1/+1
| | | | | | | | | | | | | | To remove dup code; Also added two more umbrella targets: host, target. Change-Id: Ic82db571435cdbd10fd9e70e6c4195f4ca9ecd99
* | Umbrella build targets to help engineers verify buildYing Wang2013-01-291-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | With this change, by choosing the right build target, you can reduce significant verification build time: If you are working on the framework, "make target-java" sounds enough; if you are working on native target code, "make target-native" saves your time by not building the Java code. This will help reduce uncaught breakges for by default not everything is built now. Change-Id: I5a7c82d3f6372db03bea76155c8d6cc63d988eae
* | Build from source or prebuiltYing Wang2012-12-141-15/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this change, you can easily switch between building from source code and prebuilt. Set LOCAL_PREBUILT_MODULE_FILE to the path of the prebuilt file, relative to the top of the source tree, in the usual module definition. The prebuilt will be used unless any of the followings satisfied: 1) ANDROID_BUILD_FROM_SOURCE is "true", which disable prebuilt globally; 2) The module name is in ANDROID_NO_PREBUILT_MODULES; 3) The LOCAL_PATH is prefixed by any of ANDROID_NO_PREBUILT_PATHS. A developer can set ANDROID_NO_PREBUILT_MODULES or ANDROID_NO_PREBUILT_PATHS to build only his own module(s) from source, while build other modules from prebuilts. You can set ANDROID_BUILD_FROM_SOURCE to true to build everything from source. Those variables can be set with shell environmental variable or in your buildspec.mk. Sometimes module B is able to be built from source only if module A is also built from source, for example, if B is the test apk of A. In that case, you can use the macro include-if-build-from-source to include B's Android.mk only if A is built from source too, or if-build-from-source to conditionally include the definition of module B, if their module definitions are in the same Android.mk. Support host-executable-hook and host-shared-library-hook. Change-Id: Icab7cf028c87eaba0dd7efc2a7749fd6f32b44e4
* | am fc76f0eb: am 2ea957a3: Merge "Revise checks for MacOSX to build emulator"Andrew Hsieh2012-11-091-18/+1
|\ \ | |/ | | | | | | * commit 'fc76f0eb17c606eb6df639d7a6c2f4ef2f3e09f1': Revise checks for MacOSX to build emulator
| * am 2ea957a3: Merge "Revise checks for MacOSX to build emulator"Andrew Hsieh2012-11-091-18/+1
| |\ | | | | | | | | | | | | * commit '2ea957a373018ba6773c621065164256f0d84078': Revise checks for MacOSX to build emulator
| | * Revise checks for MacOSX to build emulatorAndrew Hsieh2012-11-091-18/+1
| | | | | | | | | | | | | | | | | | | | | | | | 1. Check $(HOST_CC) instead of gcc for llvm-gcc. 2. Remvoe Mac SDK 10.4 check because emulator uses the same SDK version as the rest of framework Change-Id: I4071fd45dc09a18c5341ad79e6a85e61df060fb4
| | * Filter out the overridden packages before doing required module expansion.Ying Wang2012-10-261-0/+3
| | | | | | | | | | | | | | | Bug: 6900954 Change-Id: Ib0f57dc4bfc341ec7166429a5bb71bfc5e28d271
* | | Remove nonexistent modules from PRODUCT_PACKAGESYing Wang2012-10-311-1/+1
| | | | | | | | | | | | | | | | | | and revert back to fatal error if sdk has nonexistent modules. Change-Id: Ic7185128b0253b3591592b4167ea1e26cee1aa84
* | | am 86e2fd92: am daf5e22d: Add new embedded target for a super minimal ↵Mike Lockwood2012-10-261-25/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | android build * commit '86e2fd9215faaffed47ab0373b2955d9a1892113': Add new embedded target for a super minimal android build
| * | am daf5e22d: Add new embedded target for a super minimal android buildMike Lockwood2012-10-261-25/+0
| |\ \ | | | | | | | | | | | | | | | | * commit 'daf5e22dbac03e174e22c8209ed97c44c3a2a2c9': Add new embedded target for a super minimal android build
| | * | Add new embedded target for a super minimal android buildMike Lockwood2012-10-251-25/+0
| | | | | | | | | | | | | | | | | | | | | | | | Remove obsolete BUILD_TINY_ANDROID Change-Id: Ic0f3a5b3250ea80529f5099653068f118a13b12e
* | | | resolved conflicts for merge of 37868329 to masterKenny Root2012-10-161-5/+0
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I437f42a7197d1716b4783749f2b27e19c8721395
| * | | am 2e0d1af7: Merge changes I58d43128,Ie34c958fKenny Root2012-10-161-5/+0
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | * commit '2e0d1af767f64996f47de2a84b685ddcfa02e686': Remove HAVE_SELINUX guards, part 2 Remove HAVE_SELINUX guard
| | * | Remove HAVE_SELINUX guards, part 2Kenny Root2012-10-161-5/+0
| | | | | | | | | | | | | | | | Change-Id: I58d43128447ef3be0f70ff2479af2e61fe4c5849
| * | | resolved conflicts for merge of 01b2aaaa to jb-mr1-dev-plus-aospElliott Hughes2012-10-031-1/+0
| |\ \ \ | | |/ / | | | / | | |/ | |/| Change-Id: I66481eb8b269775716f79e42e9d89c2ebbd45288
| | * Build only modules required by the current product.Ying Wang2012-10-031-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't build modules_to_check by default. Instead add "checkbuild" to the command line as a build goal, if you want to build everything. We can use the "checkbuild" goal to make sure some build targets on the build server still build everything. (cherry-pick of 5a88269ad6ed44fb163f96847954faac21292567.) Bug: 7253452 Change-Id: I21eb93f3cb430c9531fe41a2f5d7b445c09938b9
* | | Remove build variant "tests"Ying Wang2012-10-011-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5368571 Now we have a phony target "tests" instead. The target can be built in any other build variant (eg userdebug). For example, "make PRODUCT-full-userdebug tests dist" will build and put the *-test-* zip file in the dist dir. The "tests" target will include all modules tagged as "tests" in addition to other modules in specific target out directories. Change-Id: I8383097380d8e6846c3e2107d6dd5f68788cfc39
* | | Build only modules required by the current product.Ying Wang2012-09-281-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't build modules_to_check by default. Instead add "checkbuild" to the command line as a build goal, if you want to build everything. We can use the "checkbuild" goal to make sure some build targets on the build server still build everything. Bug: 7253452 Change-Id: I84b62116131e85d1f32d58a424cdfd9d51fa9755
* | | Don't install all host modules by default.Ying Wang2012-09-241-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Instead we should explicitly set up the dependency, if the module will be used in the build process; Use LOCAL_MODULE_TAGS with eng, debug or tests if the module is for testing; or add to PRODUCT_PACKAGES if it's required by a product. Change-Id: I326e97df6630dee4acc6582ce6cef2dec8289155
* | | am a52d50a2: am 063d0c5d: Merge "Add openssl to TINY_ANDROID build" into ↵Benoit Goby2012-09-121-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | jb-mr1-dev * commit 'a52d50a235d07229ade4595e0551c1b0409c23be': Add openssl to TINY_ANDROID build
| * | Add openssl to TINY_ANDROID buildBenoit Goby2012-09-111-0/+1
| | | | | | | | | | | | | | | | | | adb depends on it Change-Id: I79f23315142b45bc7f9a2685fa2b9865b22396ad
* | | am 4084c112: am 2d39468b: Merge "Filter out the overridden packages before ↵Ying Wang2012-08-241-0/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | doing required module expansion." into jb-mr1-dev * commit '4084c112e5d073bd0d6875c45939ed7fba62ed14': Filter out the overridden packages before doing required module expansion.
| * | Filter out the overridden packages before doing required module expansion.Ying Wang2012-08-231-0/+3
| | | | | | | | | | | | | | | Bug: 6900954 Change-Id: Ib0f57dc4bfc341ec7166429a5bb71bfc5e28d271
* | | am d19511a6: am c3a4cfe9: Merge "Support EMMA_INSTRUMENT in both full and ↵Ying Wang2012-08-221-0/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | unbundled builds." into jb-mr1-dev * commit 'd19511a6657efc7f1a7e544df04f076223f8fe65': Support EMMA_INSTRUMENT in both full and unbundled builds.
| * | Support EMMA_INSTRUMENT in both full and unbundled builds.Ying Wang2012-08-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6987838 - With this change, use "EMMA_INSTRUMENT=true" to enable emma in full or unbundled build. - You don't need to add "LOCAL_STATIC_JAVA_LIBRARIES += emma" any more for unbundled apps. - Now a single var LOCAL_EMMA_INSTRUMENT replaces the previous LOCAL_NO_EMMA_INSTRUMENT and LOCAL_NO_EMMA_COMPILE. - By default, if EMMA_INSTRUMENT is true, emma is enabled for only non-test apps. - A new global var EMMA_INSTRUMENT_STATIC. It enables EMMA_INSTRUMENT and builds emma into apk/jar as static library, instead of using emma as part of shared library core.jar. Change-Id: I0aa219e83074879ececc159b5b07c39eb07ccc00
* | | resolved conflicts for merge of 34539244 to masterJoe Onorato2012-08-171-8/+8
|\ \ \ | |/ / | | | | | | Change-Id: I55b5c4aea999ff3fb5ceaabfe5d658a296f3d971
| * | resolved conflicts for merge of fab83a3d to jb-mr1-devJoe Onorato2012-08-171-4/+4
| |\ \ | | |/ | | | | | | Change-Id: I97aff2be317fd10b68d933e65259ec48bd5ff6a1
| | * Another error to warningJoe Onorato2012-08-171-1/+1
| | | | | | | | | | | | Change-Id: Ifbad63e3eb37d087d88a39e102b4239f305d0ee3
| * | resolved conflicts for merge of 5836d3b3 to jb-mr1-devJoe Onorato2012-08-171-39/+48
| |\ \ | | |/ | | | | | | Change-Id: If3d84a7439717ccf7723b3f79e934d73abbb3fea
| | * build system changes for jb-aah-dev mergeJoe Onorato2012-08-161-6/+7
| | | | | | | | | | | | Change-Id: I29e27505a0d9f7cc2932f725bfe1c83d804388bc
| | * Fail when a non-vendor product references a vendor module.Joe Onorato2012-08-161-6/+6
| | | | | | | | | | | | Change-Id: Ia5ca233e9b11f64b72074f65899d3041cf955c4c
| | * Remove support for user tags in the build system.Joe Onorato2012-08-161-49/+29
| | | | | | | | | | | | | | | | | | | | | | | | It is not forbidden to say LOCAL_MODULE_TAGS := user, and if you don't say LOCAL_MODULE_TAGS, it now defaults to optional. Change-Id: I0a0b200bb6f1c7bf1fe3a89cdc8f69678617526c
generated by cgit v1.1 at 2025-02-19 09:34:12 +0000