summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Clean the last bit of LOCAL_BUILD_HOST_DEX.Ying Wang2014-07-072-3/+2
| | | | | | Long live LOCAL_BUILD_HOST_DEX! Change-Id: I8de23cfc78edc554606a2e1a8a955e8bc3ad02b0
* Merge "Strip all multidex files, not just classes.dex"Brian Carlstrom2014-07-011-1/+5
|\
| * Strip all multidex files, not just classes.dexBrian Carlstrom2014-07-011-1/+5
| | | | | | | | | | Bug: 10447095 Change-Id: I6053ca97cb0e28621262a385d57c0996e7c1aaab
* | Fix partition_tag usage in install_jni_libsDan Willemsen2014-07-011-2/+2
|/ | | | | | | This was expanding to TARGET_VENDOR_OUT_SHARED_LIBRARIES which was empty. It should be expanding to TARGET_OUT_VENDOR_SHARED_LIBRARIES. Change-Id: I32fe22e3e0b91a6d41f6a09a33d3ce2e4061d078
* Merge "More consistent host library path in multilib build."Ying Wang2014-06-301-6/+4
|\
| * More consistent host library path in multilib build.Ying Wang2014-06-301-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 64-bit multilib host build, changed from 32-bit lib: out/host/<platform>/lib32 64-bit lib: out/host/<platform>/lib to 32-bit lib: out/host/<platform>/lib 64-bit lib: out/host/<platform>/lib64 . That way the host library path is consistent with the multilib target build's. Also with this change prebuilt 32-bit libraries can be reused in 64-bit host build as 2nd arch binaries. (With previous setup, they can't be used because they have rpath ../lib in it while the 2nd arch library path needs ../lib32. Change-Id: I020199d0c7dd52cdc8dcb7d3a1d22cd6178672e1
* | Merge "Add -Wl,--fatal-warnings to x86_64."Elliott Hughes2014-06-261-0/+1
|\ \ | |/ |/|
| * Add -Wl,--fatal-warnings to x86_64.Elliott Hughes2014-06-301-0/+1
| | | | | | | | | | Bug: 11358761 Change-Id: I0c86a2ce3f95e89cc6c6eed65f3595922a90f45f
* | Fix missing rs_compatibility_jni_libs.Ying Wang2014-06-301-0/+2
| | | | | | | | | | Bug: 15935150 Change-Id: I2971bcf4a9fa96e7a5098a759ecc67ba4f565b6c
* | Host support for prefer symlinkIan Rogers2014-06-271-9/+21
|/ | | | | | | We need a host symlink for dalvik, our *-dalvik-host build targets are failing. Change-Id: I6045de20c948b456a150033deb3459895aff83c6
* Add --pseudo-localize aapt parameter for builds.Igor Viarheichyk2014-06-262-1/+8
| | | | | | | | | | Some packages can override list of locales with LOCAL_AAPT_INCLUDE_ALL_RESOURCES parameter, disabling pseudolocalization. Adding new --pseudo-localize flag to aapt if pseudo-locales are specified in product locales list solves this issue. Change-Id: Iae705d4fe99453650339fd1ca65d1005671b3e4f
* Allow LOCAL_RESOURCE_DIR pointing to dir generated during the buildYing Wang2014-06-252-9/+18
| | | | | Bug: 15850610 Change-Id: I46b98adb556d8e6bf166761f8bb240006dbe5b14
* Support to add JNI of both archs in multilib build.Ying Wang2014-06-256-94/+182
| | | | | | | | | | | Use "LOCAL_MULTILIB := both" to install jni libraries of both archs in multilib build. The build system will package jni of both archs to the apk, or install them to the right location on the system image and create symlinks, extract .so files from prebuilt apk, etc if appropriate. Bug: 15849902 Change-Id: I7e147b5a47db476584c38250de7b36c75ea40d81
* 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
* Switch another reference from core to core-libartBrian Carlstrom2014-06-231-1/+1
| | | | | Bug: 14298175 Change-Id: I37dc7d5bc63d967db4b3cb8aee695a40b12a8c8d
* Merge "Restore AOSP-style version numbers - DO NOT MERGE"Bill Yi2014-06-201-2/+2
|\
| * Restore AOSP-style version numbers - DO NOT MERGEBill Yi2014-06-191-2/+2
| |
* | Fix the CTS build now that core is goneNeil Fuller2014-06-191-1/+1
|/ | | | Change-Id: Id36844d17ed7551095fbca4a01e0aaf5224b7ea8
* Merge "Switch from core to core-libart"Brian Carlstrom2014-06-186-7/+7
|\
| * Switch from core to core-libartBrian Carlstrom2014-06-186-7/+7
| | | | | | | | | | Bug: 14298175 Change-Id: I1db40e7c67322d80a108b2b88e6d2e6d275d7898
* | Merge "Rewrite the clean steps for TARGET_2ND_ARCH."Ying Wang2014-06-181-0/+22
|\ \ | |/ |/|
| * Rewrite the clean steps for TARGET_2ND_ARCH.Ying Wang2014-06-181-0/+22
| | | | | | | | | | | | Convert clean rules from TARGET_ARCH to TARGET_2ND_ARCH and vice versa. Change-Id: I5711b38cd834272d26d78e5cf847e97f27139c5b
* | Merge "build: delete 64-bit blacklist"Colin Cross2014-06-174-21/+1
|\ \ | |/ |/|
| * build: delete 64-bit blacklistColin Cross2014-06-174-21/+1
| | | | | | | | | | | | The last projects in the blacklist have been fixed, delete the code. Change-Id: I0fe7809bd18e32516374c9cb2a6f71df1d3c62ee
* | Use the correct MKBOOTIMG.Ying Wang2014-06-181-2/+2
|/ | | | Change-Id: I7450a85770cc8de2ea313570999a7d7076e950d2
* Help catch common 32/64-bit errors.Brian Carlstrom2014-06-171-1/+5
| | | | | | (cherry picked from commit cf5ea762e015bc044d251814d9062ef1df4dd49f) Change-Id: I43eb93d41967c63acb0723083c0178019f1364d0
* Merge "Make default 64-bit primary, 32-bit secondary"Narayan Kamath2014-06-171-1/+1
|\
| * Make default 64-bit primary, 32-bit secondaryBrian Carlstrom2014-06-161-1/+1
| | | | | | | | Change-Id: I2613a5072e2778307eebdc95d81f184f748ce9f5
* | Merge "Also include the binaries for the 2nd arch."Ying Wang2014-06-161-3/+7
|\ \
| * | Also include the binaries for the 2nd arch.Ying Wang2014-06-161-3/+7
| | | | | | | | | | | | | | | | | | | | | Also include the binaries for the 2nd arch when building module packages. Change-Id: I50d2c7451a77cbccdb365c8efea6c77f5147fde6
* | | Merge "Explicit record the modules' built-file:installed-file"Ying Wang2014-06-163-18/+26
|\ \ \ | |/ /
| * | Explicit record the modules' built-file:installed-fileYing Wang2014-06-163-18/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This simplifies the logic to get the mapping of built-file to installed-file. Previously we used file suffix matching which is error prone and not scalable. - With this change the .odex files will be included automatically. Bug: 13585955 Change-Id: I4599abf93b9d501bac7aca7758d7f3aee21b3e36
* | | Merge "Put modules with install path to system/ to DATA/ in the zip file."Ying Wang2014-06-161-1/+1
|\ \ \ | |/ /
| * | Put modules with install path to system/ to DATA/ in the zip file.Ying Wang2014-06-161-1/+1
| | | | | | | | | | | | Change-Id: I3948c28bb3f988d57da41d6eb8f97da4e20b0e86
* | | Remove unused hosts.Elliott Hughes2014-06-162-676/+0
|/ / | | | | | | | | | | Nobody is using freebsd-x86 or linux-ppc. Change-Id: I4e19fd32d92b39ad574001e7046e37ccd2300a2e
* | Trim down BUILD_FINGERPRINT.Ying Wang2014-06-132-2/+9
|/ | | | | Bug: 15593959 Change-Id: I90161045b5d5f2df726a4f69740f0875c8bfc69f
* Merge "Remove useless stuff from "AndroidConfig.h"."Elliott Hughes2014-06-128-97/+2
|\
| * Remove useless stuff from "AndroidConfig.h".Elliott Hughes2014-06-128-97/+2
| | | | | | | | | | | | | | | | The futex wrappers and memcmp16 are no longer available to anyone. No one was checking for the existence of the SA_NOCLDWAIT constant, and even if they wanted to, they could just check directly. Change-Id: If8ac6c2617b76b23a2450f58fc03453f7f82a61f
* | 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
* | Merge "Revert "Don't rename host libraries if only one arch is build.""Ying Wang2014-06-102-10/+0
|\ \
| * | Revert "Don't rename host libraries if only one arch is build."Ying Wang2014-06-112-10/+0
| | | | | | | | | | | | | | | | | | This reverts commit b1f7fb7a508bb6b093c8b37d65adc9a5a0836e6e. Change-Id: Id7ea4803ab52659c1316ea9f1babf8117b667441
* | | Allow to opt out both multilib in native test.Ying Wang2014-06-101-0/+4
|/ / | | | | | | | | | | This fixes error no 64-bit libdvm for dalvik-vm-unit-tests. Change-Id: Ieb21b3b636facbff32c62bca8bba1df6d21377c6
* | Don't rename host libraries if only one arch is build.Ying Wang2014-06-102-0/+10
| | | | | | | | | | | | | | This makes it simpler to reference normal host modules by just their original names even if they are built for the 2nd arch. Change-Id: I49d32dad0dc523c458d5f9176993037d8695e6a5
* | Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn't restrictedYing Wang2014-06-104-3/+6
| | | | | | | | | | | | | | | | Otherwise we may end up conflict between LOCAL_MODULE_HOST_ARCH and the default multilib mode. Also removed the unneeded variants of LOCAL_MODULE_HOST_ARCH. Change-Id: I9e5a0144da3cb6310be0ddf098738987e51305de
* | Fix loophole in module expansion.Ying Wang2014-06-105-53/+40
|/ | | | | | | | | | | | | | | | 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
* Add global variable HOST_LIBRARY_PATH.Ying Wang2014-06-101-2/+5
| | | | | | | | | | | | | With multilib host build, the build system installs host shared libraries to different directories depending on a library's bitness: - HOST_OUT_SHARED_LIBRARIES points to the library path of 64-bit; - 2ND_HOST_OUT_SHARED_LIBRARIES points to the library path of 32-bit; - If you don't care the bitness of the libraries and just want whatever version the librareies are built by default, use HOST_LIBRARY_PATH. Bug:13751317 Change-Id:Id4c818941dc4ea35d795767c76f698529bd6aebb
* Switch to 32-bit-by-default host multilib build.Ying Wang2014-06-094-19/+16
| | | | | | | | Also we don't need to force LLVM built from source, for we already force LLVM to be built as 32-bit. Bug: 13751317 Change-Id: Ifadf1988d28b60cb06316de50f5bdc1834f1acc0
* Merge "build native tests for 32-bit and 64-bit"Ying Wang2014-06-092-2/+15
|\
| * build native tests for 32-bit and 64-bitColin Cross2014-03-262-2/+15
| | | | | | | | | | | | | | 32-bit tests will build into /data/nativetest 64-bit tests will build into /data/nativetest64 Change-Id: I31492c7d1273ba18bb2577fae150008a214c3bf4
* | Merge "Support .asm being compiled by yasm targeted for x86."Ying Wang2014-06-093-0/+25
|\ \