summaryrefslogtreecommitdiffstats
path: root/core/main.mk
Commit message (Collapse)AuthorAgeFilesLines
* Push ISA features into system propertiesCalin Juravle2014-08-261-0/+5
| | | | | | | | | We need to know instruction set featues at runtime as well so that the apps get compiled on target with the proper features. The properties are read by installd and passed to dex2oat. Bug: 16716262 Change-Id: Ia73f2055f696880d45a63a0d6e0ee98d37a01113
* Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [build]Brian Carlstrom2014-08-061-2/+2
| | | | | | | | | | This will allow us to conditionally change the compiler-filter based on other properties. Bug: 15165413 (cherry picked from commit 4d30e5e2604a77df2acd41e36cbca54cd42cbf0a) Change-Id: I84e8038c6536291e6775f39b33556b8169fdf292
* am daaec135: am 5899ad25: am b00bb2d8: Merge "Resolve :32 to 32-bit variant ↵Ying Wang2014-06-241-1/+3
|\ | | | | | | | | | | | | only if the variant exists." * commit 'daaec135b4d141335fc1f4e3edf9eb526c9f6954': Resolve :32 to 32-bit variant only if the variant exists.
| * am 5899ad25: am b00bb2d8: Merge "Resolve :32 to 32-bit variant only if the ↵Ying Wang2014-06-241-1/+3
| |\ | | | | | | | | | | | | | | | | | | variant exists." * commit '5899ad254d3b94653b88e5f0f41f54690f22bd24': Resolve :32 to 32-bit variant only if the variant exists.
| | * Resolve :32 to 32-bit variant only if the variant exists.Ying Wang2014-06-241-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise we just use the original module name. With this change :32 in 32-bit product configuration will be installed as expected. Change-Id: Ibbbf3e8807a17b47f4259c00000a63336bc02f92
* | | am a1ac4736: am b110da5f: am 9d8854e3: Merge "build: delete 64-bit blacklist"Colin Cross2014-06-181-2/+0
|\ \ \ | |/ / | | | | | | | | | * commit 'a1ac47367636c0473156679f8f30af626df7da85': build: delete 64-bit blacklist
| * | am b110da5f: am 9d8854e3: Merge "build: delete 64-bit blacklist"Colin Cross2014-06-181-2/+0
| |\ \ | | |/ | | | | | | | | | * commit 'b110da5f2bf9cf105dd675648075d13c942d1892': build: delete 64-bit blacklist
| | * build: delete 64-bit blacklistColin Cross2014-06-171-2/+0
| | | | | | | | | | | | | | | | | | The last projects in the blacklist have been fixed, delete the code. Change-Id: I0fe7809bd18e32516374c9cb2a6f71df1d3c62ee
* | | am 2ebf7c1c: am 6b468193: am cc2a47bf: Merge "Check existence of both 64-bit ↵Ying Wang2014-06-111-14/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | and 32-bit module variants." * commit '2ebf7c1c5f3e04f13fa7d80dcc5d060306a8a475': Check existence of both 64-bit and 32-bit module variants.
| * | am 6b468193: am cc2a47bf: Merge "Check existence of both 64-bit and 32-bit ↵Ying Wang2014-06-111-14/+7
| |\ \ | | |/ | | | | | | | | | | | | | | | module variants." * commit '6b468193536c1925944ccbf6269ee057e080aef4': Check existence of both 64-bit and 32-bit module variants.
| | * Check existence of both 64-bit and 32-bit module variants.Ying Wang2014-06-101-14/+7
| | | | | | | | | | | | | | | | | | | | | - Do the module name resolving for both host and target modules. - Check existence of both 64-bit and 32-bit module variants. Change-Id: I8ada0e734efac6c8dafade8708fff9797b19a78d
* | | am dceddd91: am 79b46720: am 02f98a26: Merge "Fix loophole in module expansion."Ying Wang2014-06-111-23/+37
|\ \ \ | |/ / | | | | | | | | | * commit 'dceddd91d9a6516346e752b9f942747bea931cfa': Fix loophole in module expansion.
| * | am 79b46720: am 02f98a26: Merge "Fix loophole in module expansion."Ying Wang2014-06-101-23/+37
| |\ \ | | |/ | | | | | | | | | * commit '79b46720e606e3db5fff87f672b73613a9a19c69': Fix loophole in module expansion.
| | * Fix loophole in module expansion.Ying Wang2014-06-101-23/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ab6f84e3: am e0df9d95: Merge "Only enable WITH_DEXPREOPT by default for ↵Brian Carlstrom2014-05-291-4/+6
| |\ \ | | |/ | | | | | | | | | | | | | | | libdvm.so" * commit 'ab6f84e3d1886237e9516ebe4660d8e1042a6a75': Only enable WITH_DEXPREOPT by default for libdvm.so
| | * Only enable WITH_DEXPREOPT by default for libdvm.soBrian Carlstrom2014-05-291-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 14298175 (cherry picked from commit 9f8e214a919097284a88cb19a1b85ceafc202a67) Change-Id: I96ba4e198b7bc1b7d9a502c432590f41c87d05c4
* | | am 9f8e214a: Only enable WITH_DEXPREOPT by default for libdvm.soBrian Carlstrom2014-05-291-4/+6
|\ \ \ | | | | | | | | | | | | | | | | * commit '9f8e214a919097284a88cb19a1b85ceafc202a67': Only enable WITH_DEXPREOPT by default for libdvm.so
| * | | Only enable WITH_DEXPREOPT by default for libdvm.soBrian Carlstrom2014-05-281-4/+6
| | | | | | | | | | | | | | | | | | | | Bug: 14298175 Change-Id: I42255a61667f88924a779fff1812134044c7b6b2
* | | | am 2bf10a72: am cdcb6926: am 6cb69bd4: Merge "Add HOST_PREFER_32_BIT to ↵Ying Wang2014-05-231-0/+8
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | support 32-bit-by-default multilib build" * commit '2bf10a72f87a8e97923286aa331f7db81e2361ca': Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build
| * | am cdcb6926: am 6cb69bd4: Merge "Add HOST_PREFER_32_BIT to support ↵Ying Wang2014-05-231-0/+8
| |\ \ | | |/ | | | | | | | | | | | | | | | 32-bit-by-default multilib build" * commit 'cdcb6926d40b502ed89a285cdd4d99beb4cf8009': Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build
| | * Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib buildYing Wang2014-05-201-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We already support pure 32-bit and 64-bit-by-default multilib build. With HOST_PREFER_32_BIT we can build 32-bit-by-default multilib build. This will be lest disruptive during the period we transition to 64-bit-by-default. Bug: 13751317 Change-Id: I0d56ce4abbe4afeaacfd70d709f6a349791c0722
* | | Don't build tests in PDK build.Ying Wang2014-05-211-0/+2
| | | | | | | | | | | | Change-Id: I8994be0938a3ce87a097669c28b232fd04b77a36
* | | check build tests modules in eng and userdebug buildsYing Wang2014-05-211-0/+4
| | | | | | | | | | | | | | | | | | | | | To catch more build breakage, check build tests modules in eng and userdebug builds. Change-Id: Ic3b34dcd199e50e555c33eb686a501acef59a8c2
* | | am e50f2d9f: am 40b49d30: am a74ade94: Merge "Support host multilib build"Ying Wang2014-05-151-8/+0
|\ \ \ | |/ / | | | | | | | | | * commit 'e50f2d9f32a27d8290692dbf99ab8b247ef9d553': Support host multilib build
| * | am 40b49d30: am a74ade94: Merge "Support host multilib build"Ying Wang2014-05-151-8/+0
| |\ \ | | |/ | | | | | | | | | * commit '40b49d3043bd41ca5548b99b537038187fdca258': Support host multilib build
| | * Support host multilib buildYing Wang2014-05-141-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change basically ported our target multilib to the host side. It supports 2 host build modes: x86 and x86_64 multilib build. For now you need to set "BUILD_HOST_64bit=true" to switch to x86_64 multilib build. Later we'll default to x86_64 build and have a flag to force 32-bit only build, which may be needed by SDK build. In host module definition, like in target ones, you can use the following LOCAL variables to set up multilib configuration: LOCAL_MULTILIB: can be "both", "first", "32" or "64". It also supports the same set of arch or 32-vs-64 specific LOCAL variables. By default, it builds only for the first arch. To keep path compatibility, in x86_64 build files are still output to out/host/linux-x86; Both 32-bit and 64-bit executables are in out/host/linux-86/bin; In x86_64 build 32-bit shared libraries are installed to out/host/linux-x86/lib32 and 64-bit shared libraries are installed to out/host/linux-x86/lib; 32-bit object files are output to out/host/linux-x86/obj32 and 64-bit object files are output to out/host/linux-x86/obj. Bug: 13751317 Change-Id: I6044f83b7db369a33e05209e8c588eb6dc83409f
* | | am 873782cc: am 9e3259f5: am fb67f05d: Merge changes I53b2ada9,I30794ea5David 'Digit' Turner2014-05-111-15/+1
|\ \ \ | |/ / | | | | | | | | | | | | * commit '873782ccd44349c766f5d74e65b3b323618dd6ed': Disable emulator from platform builds. envsetup.sh: Use prebuilt emulator binaries if available.
| * | am 9e3259f5: am fb67f05d: Merge changes I53b2ada9,I30794ea5David 'Digit' Turner2014-05-111-15/+1
| |\ \ | | |/ | | | | | | | | | | | | * commit '9e3259f50d6aa2ca4430430d71d2fffd58662650': Disable emulator from platform builds. envsetup.sh: Use prebuilt emulator binaries if available.
| | * Disable emulator from platform builds.David 'Digit' Turner2014-05-091-15/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that emulator prebuilts are available under prebuilts/android-emulator/, disable building the emulator from source in all platform builds, except if one defines BUILD_EMULATOR to 'true' in its environment. NOTE: This patch should be applied after this one to avoid issues with the GPU emulation libraries: https://android-review.googlesource.com/93980 Change-Id: I53b2ada9ca0c2e159dccee7cdca7f55f6b0d1d42
| * | am d6214b31: am 0d4b3df6: Merge "Target "tests" now only builds the modules ↵Ying Wang2014-05-091-1/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | tagged as "tests"" * commit 'd6214b3161161faf63a60b3ad3f595569a481192': Target "tests" now only builds the modules tagged as "tests"
| | * Target "tests" now only builds the modules tagged as "tests"Ying Wang2014-05-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | But not install them. This prevents "make tests" polluting system.img or userdata.img. We have new mechanism to build and package up modules into zip file in build/core/tasks/tools. Change package-modules.mk to install DATA/ instead of data/ in the zip file; Better handle of module name conflicting. Bug: 13585955 Change-Id: I7586a8c7995b984c9ead0ba2fa84dd5d2dd20bd1
* | | Merge "Target "tests" now only builds the modules tagged as "tests""Ying Wang2014-05-081-1/+2
|\ \ \
| * | | Target "tests" now only builds the modules tagged as "tests"Ying Wang2014-05-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | But not install them. This prevents "make tests" polluting system.img or userdata.img. We have new mechanism to build and package up modules into zip file in build/core/tasks/tools. Change package-modules.mk to install DATA/ instead of data/ in the zip file; Better handle of module name conflicting. Bug: 13585955 Change-Id: I7586a8c7995b984c9ead0ba2fa84dd5d2dd20bd1
* | | | am 676c8f04: am 4ed19f0f: am 1e63c2d1: Merge "Add dalvik.vm.dex2oat-flags ↵Brian Carlstrom2014-05-081-0/+4
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | for eng build" * commit '676c8f0450a9dfb84c12257195ba05619aeed970': Add dalvik.vm.dex2oat-flags for eng build
| * | am 4ed19f0f: am 1e63c2d1: Merge "Add dalvik.vm.dex2oat-flags for eng build"Brian Carlstrom2014-05-081-0/+4
| |\ \ | | |/ | | | | | | | | | * commit '4ed19f0f4294544d0447025f0079a9d9e185a495': Add dalvik.vm.dex2oat-flags for eng build
| | * Add dalvik.vm.dex2oat-flags for eng buildBrian Carlstrom2014-05-061-0/+4
| | | | | | | | | | | | | | | Bug: 12869646 Change-Id: I794320267c846225931f12075c7f32d7848081e9
* | | resolved conflicts for merge of 70555a16 to masterYing Wang2014-04-151-1/+1
|\ \ \ | |/ / | | | | | | Change-Id: Ibb8ea3159e2a3fa7a70f2359a02c4625812995a8
| * | am fcd22c88: Merge "Allow to build target-files.zip in sdk build." into ↵Ying Wang2014-04-151-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit 'fcd22c8848b829eec7e661fb270fea1a18bcba28': Allow to build target-files.zip in sdk build.
| | * | Allow to build target-files.zip in sdk build.Ying Wang2014-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | and put the target-files.zip on the build server. Bug: 13763122 Change-Id: I71ab6aa40666fdb24ec0da0fbfc7b73753d4f0c7
| * | | am 0df45b08: am 260942fa: Merge "Build with java7 by default."Ying Wang2014-04-051-51/+33
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit '0df45b0898710a2e7ddd723fae450ad701a4614d': Build with java7 by default.
| | * | Build with java7 by default.Narayan Kamath2014-04-041-51/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All introduce a flag LEGACY_USE_JAVA6 to force java6 builds. This is an unsupported configuration, and provided temporarily to iron out regressions and compare build output (if required.). - Increment the version check sequence number. - Move a more specific check (OpenJDK vs non OpenJDK) after the more general version check. - Update the link in the version check error message to the "initializing" page instead of the "download" page. The latter talks about repo, mainly. bug: 8992787 Change-Id: I313e17b1911768d4f3bc318c4162c53dec6eaf0d Conflicts: core/main.mk
* | | | Preserve symlinked OUT_DIR by only clearing contentsAlan Viverette2014-04-071-1/+1
| | | | | | | | | | | | | | | | Change-Id: I824ecd46d7fd31885024ff20cf5cbd52e2cbb713
* | | | Build with java7 by default.Narayan Kamath2014-04-041-43/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All introduce a flag LEGACY_USE_JAVA6 to force java6 builds. This is an unsupported configuration, and provided temporarily to iron out regressions and compare build output (if required.). - Increment the version check sequence number. - Move a more specific check (OpenJDK vs non OpenJDK) after the more general version check. - Update the link in the version check error message to the "initializing" page instead of the "download" page. The latter talks about repo, mainly. bug: 8992787 Change-Id: I313e17b1911768d4f3bc318c4162c53dec6eaf0d
* | | | am 88e1a110: am 680e0370: am 59ff6009: Merge "Unset _JAVA_OPTIONS before ↵Ying Wang2014-04-031-6/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | running "java -version"." * commit '88e1a1103acaf5e61fd11a7c006a0c465214ac78': Unset _JAVA_OPTIONS before running "java -version".
| * | | am 680e0370: am 59ff6009: Merge "Unset _JAVA_OPTIONS before running "java ↵Ying Wang2014-04-031-6/+6
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | -version"." * commit '680e037007fd0f4207a4734b8fccce17a91ee682': Unset _JAVA_OPTIONS before running "java -version".
| | * | Unset _JAVA_OPTIONS before running "java -version".Ying Wang2014-04-021-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Unfortunately the previous approach of grepping out java version before "head -n 1" clash with the effort of running "java -version" only once. Change-Id: Ic78719c3bf1a54a45342d74bbbfa8e83bbc1bce1
| * | | am 81fc969b: am cf352c5d: Merge "Add warning message for java6 builds."Narayan Kamath2014-04-021-1/+20
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '81fc969b65fb4cc7dc9f5698aa8c37c657f853ef': Add warning message for java6 builds.
| | * | Add warning message for java6 builds.Narayan Kamath2014-04-021-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The instruction URL has been amended and a few additional details have been added. (cherry picked from 8c06afdea3d3c422d653b40fd19d5e3d4be64af2) Change-Id: Icaffc3b13ed881ac7e29f2021ed31eb1f877a5ab
| * | | am 35200762: am e28df19e: Merge "Call "java[c] -version" only once"Narayan Kamath2014-04-021-9/+14
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '35200762980aa2c0f90e73e38af94fd29b50f91f': Call "java[c] -version" only once
| | * | Call "java[c] -version" only onceYing Wang2014-04-021-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and print out the full output if error occurs. Bug: 11672548 (cherry picked from 7b66d366bf5c469130f71d0870424fcd265e0301) Change-Id: I8e2f2ffa2f28146405273b04667efe3c8d1c03ad
generated by cgit v1.1 at 2025-03-20 02:41:27 +0000