summaryrefslogtreecommitdiffstats
path: root/core/main.mk
Commit message (Collapse)AuthorAgeFilesLines
* Conditionally include the 'samplecode' rules.Ying Wang2014-02-261-0/+2
| | | | | | Not sure goal 'samplecode' is still used by anybody these days. Change-Id: I808a021a6e4be6a97c4b5c256b94374c1b3dae47
* Don't check the existence for the 64-bit modules for 32-bit SDK build.Ying Wang2014-02-131-0/+4
| | | | Change-Id: I0d5d6ecc07332bef6854466fd98380eb12fc08fc
* HACK: add 64-bit directory blacklistColin Cross2014-02-121-0/+2
| | | | Change-Id: I431e8b220db81d51930dc0b3d95995df120c179a
* Merge "Clean up dangling module names"Ying Wang2014-02-121-1/+5
|\
| * Clean up dangling module namesYing Wang2014-02-111-1/+5
| | | | | | | | | | | | | | | | Those modules have disappeared from the source tree. https://code.google.com/p/android/issues/detail?id=61210 Change-Id: Iab369d2f591f46eb86b9fccf2087515edf974662
* | Refine module name resolving in multilib buildYing Wang2014-02-101-1/+56
|/ | | | | | | | | | | | | | | | | | | | | | -- Added TARGET_PREFER_32_BIT, which sets LOCAL_32_BIT_ONLY for an executable, if LOCAL_NO_2ND_ARCH is not true. Name resolving in 64-bit multilib build: -- Name resolving in PRODUCT_PACKAGES: foo:32 resolves to foo_32; foo:64 resolves to foo; foo resolves to both foo and foo_32 (if foo_32 is defined). -- Name resolving for LOCAL_REQUIRED_MODULES: If a module is built for 2nd arch, its required module resolves to 32-bit variant, if it exits; Otherwise for executable and shared library, a required module resolves to the default 64-bit variant; for other module classes, required module foo resolves to both foo and foo_32 (if foo_32 is defined) Bug: 12898862 Change-Id: I5fda1a77f58814097b10b5ad2743ee25adfaecc4
* Dedup the targets and dependencies of required modules.Ying Wang2014-01-311-0/+2
| | | | | | | | For whatever reason, two modules may have the same file as their installed module. In that case circular dependency is created if the two modules have requited-by relation. Change-Id: I15ed271ca3f3c343e4662182ded5ccc63d6c42cc
* Set up rules to build shared libraries for TARGET_2ND_ARCHYing Wang2014-01-241-0/+8
| | | | | | | | | | | | The rules for the 2nd arch are set up in the second inclusion of shared_library_internal.mk. Intermediate fils of libfoo of the 2nd arch will be built into $(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/SHARED_LIBRARIES/libfoo_intermediates/ and the built libfoo.so will be in $(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/lib. Bug: 11654773 Change-Id: I58bbe5a05a65f63bce6279131552f3792000716e
* Add missing paren in "java -version" checkBrian Carlstrom2014-01-201-1/+1
| | | | Change-Id: Id66e795423e8d25b48ac996956748a93060ea5db
* A few more Java7 related clean ups.Narayan Kamath2013-12-051-16/+26
| | | | | | | | | | | | | - Separate SDK checking from version checking and make messages clearer. - Add explicit source & target versions for javac to make things clearer. - Rename flag from EXPERIMENTAL_USE_JAVA7_OPENJDK to EXPERIMENTAL_USE_JAVA7. - Allow Oracle JDK 1.7 to be used on Mac OS, since there's no official OpenJDK support for that platform. Change-Id: I454d2c917ed78f03ec7559a99659fefe7e7d50f3
* Merge "core: support make 4.00"Ying Wang2013-12-021-4/+2
|\
| * core: support make 4.00synergydev2013-10-171-4/+2
| | | | | | | | | | | | Make 4.00 is now out, and builds work fine with it. Change-Id: I49e36d651a7997a52270badb0e8badd975f64e8f
* | Add experimental flag to support OpenJDK builds.Ying Wang2013-11-261-7/+30
| | | | | | | | | | | | | | | | bug: 8992787 (cherry picked from commit d1dbe7f5a23bacdff086b4992e1d31a96da706c3) Change-Id: Ie977d4f26ae8d3eee9d7b9cf2c0c270bee5b54b3
* | Merge commit 'c73341006286c391ae4d268a77f5e008045d5308' into HEADThe Android Open Source Project2013-11-221-34/+44
|\ \ | | | | | | | | | Change-Id: I4bf7d32d65e19dfa1f0533fdd3b2295c50b13005
| * | Load the ONE_SHOT_MAKEFILE even in dont_bother modeYing Wang2013-09-091-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | This makes "mmm <path> snod" work again. Note that snod has dependency on the rest of the command line goals, which is all_modules for ONE_SHOT_MAKEFILE, so build race condition is avoided. Change-Id: Ib0c0e622530cde773180a095e5ec4dde1149b8e5
| * | Delete dead code.Ying Wang2013-09-091-10/+0
| | | | | | | | | | | | | | | | | | frameworks/policies/base/PolicyConfig.mk does no longer exist. Change-Id: I34d4820bc7c1e19ac84095f5f2caf6aefdfe1bd3
| * | In apps_only build dist a module only if it has a BUILT file.Ying Wang2013-08-271-1/+1
| | | | | | | | | | | | | | | | | | This allows you to specify a PHONY target in TARGET_BUILD_APPS. Change-Id: Idd813cd0dbdb14c705fbd3187596d4c64b99d045
| * | Collect NOTICE files for apps_only build.Ying Wang2013-08-241-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | In apps_only build (after running tapas or exporting TARGET_BUILD_APPS), run "make notice_files" to collect and combine the NOTICE files of modules that are needed by the apps. Bug: 10445634 Change-Id: I6555bba1104e43b48c723c82143c46d444a75e80
| * | am b88ca53a: am ddce2eb0: am de32713f: Merge "Collect and store proguard ↵Ying Wang2013-08-231-0/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | obfuscation dictionary files." into jb-mr2-dev * commit 'b88ca53a465ef004a60ceb9c4c641c3c997edeb5': Collect and store proguard obfuscation dictionary files.
| | * | Collect and store proguard obfuscation dictionary files.Ying Wang2013-08-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Collect and store proguard obfuscation dictionary files. Only do this for apps_only build for now. Bug: 9407666 Change-Id: I51c78bf0f42f959dc920de230e60e0f71ed0d0ea
| * | | am 2363485c: am 06de9f94: am 8709497e: Merge "Revert "Collect and store ↵Ying Wang2013-08-231-3/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | proguard obfuscation dictionary files."" into jb-mr2-dev * commit '2363485c2fb3f08d36e8cdbb2240b9c3993b470c': Revert "Collect and store proguard obfuscation dictionary files."
| | * | Revert "Collect and store proguard obfuscation dictionary files."Ying Wang2013-08-231-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 41dbe1e535c1aea9a4c4cec6be637fe1b882220b. Change-Id: I023594779128083b75a069fd860cd29dd7951ef5
| * | | am 93b95dc4: am aa87a11d: am afd7457a: Merge "Collect and store proguard ↵Ying Wang2013-08-231-0/+3
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | obfuscation dictionary files." into jb-mr2-dev * commit '93b95dc4b9f9b4e04e8a0fac25c958d5c52266e4': Collect and store proguard obfuscation dictionary files.
| | * | Collect and store proguard obfuscation dictionary files.Ying Wang2013-08-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Collect and store proguard obfuscation dictionary files. Only do this for apps_only build for now. Bug: 9407666 Change-Id: I0324eed6bb236abb0d3725f8d2a0b6c5c31935fe
| * | | Add phony goal GET-INSTALL-PATHYing Wang2013-08-161-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It can be used as a goal of mm/mmm. It prints out modules' install paths, which can be used by the runtest utility. Change-Id: If113e4c990b672acbacf723104583c0157d43c3b
| * | | Don't bother going through the source treeYing Wang2013-08-091-17/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't bother going through the source tree in more circumstances: all cleaning goals, helping goals, no-deps goals. Bug: 10244578 Change-Id: Id53a249085c62838e4193962a85e0ac34f46954f
| * | | More verbose on what the build system is doingYing Wang2013-07-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes users get confused for long time of no message printed to the screen. Change-Id: I99d3b2954f3dcba47d5ee5dd9fd760578c0e0192
| * | | am cd9cadbc: am 7768c91c: am 94de1eba: Put a copy of the radio/bootloader ↵Ying Wang2013-07-261-0/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files in the dist dir. * commit 'cd9cadbcf68bfe07ac994e61aa00969572ae3fd5': Put a copy of the radio/bootloader files in the dist dir.
| * | | | core: don't hardcode "out" during findleaves.py invocations.JP Abgrall2013-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "out" can be $OUT_DIR Bug: 7183057 Change-Id: I7b52d40de4398f481e47f6d6d719fb550d874f73
| * | | | Allow to run checkbuild in sdk build.Ying Wang2013-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9594464 Change-Id: Ia02e7d8fc157cdfe2e065ce9e42a3800457f89f6
| * | | | am fe365531: am 1e1241ce: Dist static Java library modules.Ying Wang2013-06-121-1/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fe365531b0ee363640fb50d5a230c0b999fbbe4d': Dist static Java library modules.
| * | | | | Remove unnecessary dependencies between host and target modules.Ying Wang2013-06-061-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
| * | | | | am 8150cfcb: am 9592af96: Merge "Do vendor check on modules installed by ↵Ying Wang2013-04-161-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LOCAL_SHARED_LIBRARIES" into jb-mr2-dev * commit '8150cfcb209dfb6ad86413cf3d4373d074f54062': Do vendor check on modules installed by LOCAL_SHARED_LIBRARIES
| * | | | | | Allow to set BUILD_EMULATOR outside the core build system.Ying Wang2013-04-121-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For example, you can set it as enviromental variable, command line makefile variable, or board config variable. Change-Id: I5a4dbb70270cb4952109b5d96fbbf61eb2603502
* | | | | | | am a05365ce: Merge "Remove the hacks needed to support ash and mksh ↵Elliott Hughes2013-11-071-2/+0
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | concurrently." * commit 'a05365ceceaead86651f61f7ba66153e36b7be5d': Remove the hacks needed to support ash and mksh concurrently.
| * | | | | | 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
* | | | | Remove unnecessary dependencies between host and target modules.Ying Wang2013-07-311-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
* | | | Put a copy of the radio/bootloader files in the dist dir.Ying Wang2013-07-261-0/+4
|/ / / | | | | | | | | | | | | Bug: 10035750 Change-Id: I3b51e61ec737899d9264885a1e66c89a7a740d54
* | | 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