am 94ff79ea: am adc66128: am b6c57051: am f5ce4fa9: Merge "Install 64-bit libraries...

* commit '94ff79eaf2d66be4c83656a41b4efa38ad34a970':
  Install 64-bit libraries to /system/lib64.

diff --cc core/Makefile
index 59432be,9f35254..3fe0922
--- 1/core/Makefile
--- 2/core/Makefile
+++ b/core/Makefile
@@@ -368,9 -368,23 +368,25 @@@ ALL_DEFAULT_INSTALLED_MODULES += $(even
  # #################################################################
  # 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
  
 +VERITY_SIGNER_CMD := $(HOST_OUT_EXECUTABLES)/verity_signer
 +
  # -----------------------------------------------------------------
  # the ramdisk
  INTERNAL_RAMDISK_FILES := $(filter $(TARGET_ROOT_OUT)/%, \

diff --cc core/config.mk
Simple merge

diff --cc core/envsetup.mk
index 24174eb,ab8426e..1f87efa
--- 1/core/envsetup.mk
--- 2/core/envsetup.mk
+++ b/core/envsetup.mk
@@@ -180,14 -203,13 +203,14 @@@ HOST_OUT_JAVA_LIBRARIES := $(HOST_OUT)/
  HOST_OUT_SDK_ADDON := $(HOST_OUT)/sdk_addon
  
  HOST_OUT_INTERMEDIATES := $(HOST_OUT)/obj
- HOST_OUT_HEADERS:= $(HOST_OUT_INTERMEDIATES)/include
+ HOST_OUT_HEADERS := $(HOST_OUT_INTERMEDIATES)/include
  HOST_OUT_INTERMEDIATE_LIBRARIES := $(HOST_OUT_INTERMEDIATES)/lib
- HOST_OUT_NOTICE_FILES:=$(HOST_OUT_INTERMEDIATES)/NOTICE_FILES
+ HOST_OUT_NOTICE_FILES := $(HOST_OUT_INTERMEDIATES)/NOTICE_FILES
  HOST_OUT_COMMON_INTERMEDIATES := $(HOST_COMMON_OUT_ROOT)/obj
 +HOST_OUT_FAKE := $(HOST_OUT)/fake_packages
  
  TARGET_OUT_INTERMEDIATES := $(PRODUCT_OUT)/obj
- TARGET_OUT_HEADERS:= $(TARGET_OUT_INTERMEDIATES)/include
+ TARGET_OUT_HEADERS := $(TARGET_OUT_INTERMEDIATES)/include
  TARGET_OUT_INTERMEDIATE_LIBRARIES := $(TARGET_OUT_INTERMEDIATES)/lib
  TARGET_OUT_COMMON_INTERMEDIATES := $(TARGET_COMMON_OUT_ROOT)/obj