diff options
| author | Ying Wang <wangying@google.com> | 2014-01-14 12:08:32 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-14 12:08:32 -0800 |
| commit | b6c570510aa1d2747538fe734292873ed13f5b67 (patch) | |
| tree | 8ae78b8b4075642000e204b8683ef5c94d83a4cb /core/Makefile | |
| parent | dda9d8ee0fe580d663a4eaed49be5d39c3de2882 (diff) | |
| parent | f5ce4fa983f08d42bbc5d96af4f86bce5c190f0c (diff) | |
| download | build-b6c570510aa1d2747538fe734292873ed13f5b67.zip build-b6c570510aa1d2747538fe734292873ed13f5b67.tar.gz build-b6c570510aa1d2747538fe734292873ed13f5b67.tar.bz2 | |
am f5ce4fa9: Merge "Install 64-bit libraries to /system/lib64."
* commit 'f5ce4fa983f08d42bbc5d96af4f86bce5c190f0c':
Install 64-bit libraries to /system/lib64.
Diffstat (limited to 'core/Makefile')
| -rw-r--r-- | core/Makefile | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/core/Makefile b/core/Makefile index a8efd4d..25cce58 100644 --- a/core/Makefile +++ b/core/Makefile @@ -368,6 +368,22 @@ ALL_DEFAULT_INSTALLED_MODULES += $(event_log_tags_file) # ################################################################# # Targets for boot/OS images # ################################################################# +ifneq ($(strip $(TARGET_NO_BOOTLOADER)),true) + INSTALLED_BOOTLOADER_MODULE := $(PRODUCT_OUT)/bootloader + ifeq ($(strip $(TARGET_BOOTLOADER_IS_2ND)),true) + INSTALLED_2NDBOOTLOADER_TARGET := $(PRODUCT_OUT)/2ndbootloader + else + INSTALLED_2NDBOOTLOADER_TARGET := + endif +else + INSTALLED_BOOTLOADER_MODULE := + INSTALLED_2NDBOOTLOADER_TARGET := +endif # TARGET_NO_BOOTLOADER +ifneq ($(strip $(TARGET_NO_KERNEL)),true) + INSTALLED_KERNEL_TARGET := $(PRODUCT_OUT)/kernel +else + INSTALLED_KERNEL_TARGET := +endif # ----------------------------------------------------------------- # the ramdisk |