update from duco/rk312x_20160510 on rockchip-5.1.0_r5 branches

d876805b · Mark Stevens · 1ac5b83b · d876805b · d876805b · d876805b
Commit d876805b authored 8 years ago by Mark Stevens
20 changed files
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -309,6 +309,14 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)

+# 5.1.1!
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)
+
+# Added new build props
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
+
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************
--- a/core/Makefile
+++ b/core/Makefile
@@ -102,6 +102,11 @@ BUILD_KEYS := test-keys
 else
 BUILD_KEYS := dev-keys
 endif
+
+ifeq ($(TARGET_BUILD_VARIANT),user)
+BUILD_KEYS := release-keys
+endif
+
 BUILD_VERSION_TAGS += $(BUILD_KEYS)
 BUILD_VERSION_TAGS := $(subst $(space),$(comma),$(sort $(BUILD_VERSION_TAGS)))

@@ -214,6 +219,8 @@ endif
 			BUILD_DISPLAY_ID="$(BUILD_DISPLAY_ID)" \
 			BUILD_NUMBER="$(BUILD_NUMBER)" \
 			PLATFORM_VERSION="$(PLATFORM_VERSION)" \
+			PLATFORM_SECURITY_PATCH="$(PLATFORM_SECURITY_PATCH)" \
+			PLATFORM_BASE_OS="$(PLATFORM_BASE_OS)" \
 			PLATFORM_SDK_VERSION="$(PLATFORM_SDK_VERSION)" \
 			PLATFORM_VERSION_CODENAME="$(PLATFORM_VERSION_CODENAME)" \
 			PLATFORM_VERSION_ALL_CODENAMES="$(PLATFORM_VERSION_ALL_CODENAMES)" \
@@ -427,11 +434,11 @@ ifneq ($(strip $(TARGET_NO_BOOTLOADER)),true)
  ifeq ($(strip $(TARGET_BOOTLOADER_IS_2ND)),true)
    INSTALLED_2NDBOOTLOADER_TARGET := $(PRODUCT_OUT)/2ndbootloader
  else
-    INSTALLED_2NDBOOTLOADER_TARGET :=
+    INSTALLED_2NDBOOTLOADER_TARGET ?=
  endif
 else
  INSTALLED_BOOTLOADER_MODULE :=
-  INSTALLED_2NDBOOTLOADER_TARGET :=
+  INSTALLED_2NDBOOTLOADER_TARGET ?=
 endif # TARGET_NO_BOOTLOADER
 ifneq ($(strip $(TARGET_NO_KERNEL)),true)
  INSTALLED_KERNEL_TARGET := $(PRODUCT_OUT)/kernel
@@ -439,6 +446,30 @@ else
  INSTALLED_KERNEL_TARGET :=
 endif

+ifeq ($(TARGET_BOARD_PLATFORM),sofia3gr)
+ifeq ($(strip $(TARGET_BOOTLOADER_IS_2ND)),true)
+ifneq ($(INSTALLED_2NDBOOTLOADER_TARGET), $(wildcard $(INSTALLED_2NDBOOTLOADER_TARGET)))
+$(INSTALLED_2NDBOOTLOADER_TARGET):
+	@echo "TODO" > $(INSTALLED_2NDBOOTLOADER_TARGET)
+endif
+
+
+ifneq ($(INSTALLED_2NDBOOTLOADER_RECOVERY_TARGET), $(wildcard $(INSTALLED_2NDBOOTLOADER_RECOVERY_TARGET)))
+$(INSTALLED_2NDBOOTLOADER_RECOVERY_TARGET):
+	@echo "TODO" > $(INSTALLED_2NDBOOTLOADER_RECOVERY_TARGET)	
+endif
+
+endif
+
+ifeq ($(strip $(TARGET_BOOTLOADER_IS_3ND)),true)	
+ifneq ($(INSTALLED_3NDBOOTLOADER_TARGET), $(wildcard $(INSTALLED_3NDBOOTLOADER_TARGET)))
+$(INSTALLED_3NDBOOTLOADER_TARGET):
+	@echo "TODO" > $(INSTALLED_3NDBOOTLOADER_TARGET)
+endif
+endif
+
+endif
+
 # -----------------------------------------------------------------
 # the ramdisk
 INTERNAL_RAMDISK_FILES := $(filter $(TARGET_ROOT_OUT)/%, \
@@ -465,10 +496,21 @@ ifneq ($(strip $(TARGET_NO_KERNEL)),true)
 # -----------------------------------------------------------------
 # the boot image, which is a collection of other images.
 INTERNAL_BOOTIMAGE_ARGS := \
-	$(addprefix --second ,$(INSTALLED_2NDBOOTLOADER_TARGET)) \
 	--kernel $(INSTALLED_KERNEL_TARGET) \
 	--ramdisk $(INSTALLED_RAMDISK_TARGET)

+ifeq ($(strip $(TARGET_BOOTLOADER_IS_2ND)),true)
+INTERNAL_BOOTIMAGE_ARGS += \
+    $(addprefix --second ,$(INSTALLED_2NDBOOTLOADER_TARGET))
+endif
+
+ifeq ($(TARGET_BOARD_PLATFORM),sofia3gr)
+ifeq ($(strip $(TARGET_BOOTLOADER_IS_3ND)),true)
+	INTERNAL_BOOTIMAGE_ARGS += \
+    	$(addprefix --third ,$(INSTALLED_3NDBOOTLOADER_TARGET))
+endif
+endif
+
 INTERNAL_BOOTIMAGE_FILES := $(filter-out --%,$(INTERNAL_BOOTIMAGE_ARGS))

 BOARD_KERNEL_CMDLINE := $(strip $(BOARD_KERNEL_CMDLINE))
@@ -545,6 +587,18 @@ else	# TARGET_NO_KERNEL
 INSTALLED_BOOTIMAGE_TARGET := $(INSTALLED_RAMDISK_TARGET)
 endif

+# -----------------------------------------------------------------
+# the rk loader bin
+INSTALLED_LOADER_MISC_TARGET := $(TARGET_DEVICE_DIR)/loader/misc_loadercmd.img
+INSTALLED_LOADER_TARGET := $(strip $(wildcard $(TARGET_DEVICE_DIR)/loader/RK*Loader*.bin))
+INSTALLED_NEW_LOADER_TARGET := $(PRODUCT_OUT)/RKLoader_new.bin
+INSTALLED_UBOOT_TARGET := $(strip $(wildcard u-boot/uboot.img))
+INSTALLED_CHARGE_TARGET := $(strip $(wildcard u-boot/charge.img))
+INSTALLED_TRUST_TARHET := $(strip $(wildcard u-boot/trust.img))
+# -----------------------------------------------------------------
+# the parameter image 
+INSTALLED_PARAMETER_TARGET := $(strip $(wildcard $(TARGET_DEVICE_DIR)/parameter/parameter*))
+
 # -----------------------------------------------------------------
 # NOTICE files
 #
@@ -651,10 +705,10 @@ $(kernel_notice_file): \
 # before the rules that use that variable to build the image.
 ALL_DEFAULT_INSTALLED_MODULES += $(TARGET_OUT_ETC)/security/otacerts.zip
 $(TARGET_OUT_ETC)/security/otacerts.zip: KEY_CERT_PAIR := $(DEFAULT_KEY_CERT_PAIR)
-$(TARGET_OUT_ETC)/security/otacerts.zip: $(addsuffix .x509.pem,$(DEFAULT_KEY_CERT_PAIR))
+$(TARGET_OUT_ETC)/security/otacerts.zip: $(addsuffix .x509.pem,$(DEFAULT_KEY_CERT_PAIR)) $(RADICAL_UPDATE_CERT)
 	$(hide) rm -f $@
 	$(hide) mkdir -p $(dir $@)
-	$(hide) zip -qj $@ $<
+	$(hide) zip -qj $@ $^

 .PHONY: otacerts
 otacerts: $(TARGET_OUT_ETC)/security/otacerts.zip
@@ -745,11 +799,20 @@ ifeq (,$(filter true, $(TARGET_NO_KERNEL) $(TARGET_NO_RECOVERY)))
 INSTALLED_RECOVERYIMAGE_TARGET := $(PRODUCT_OUT)/recovery.img

 recovery_initrc := $(call include-path-for, recovery)/etc/init.rc
+recovery_initrc_private := $(TARGET_DEVICE_DIR)/recovery/etc/init.rc
+recovery_initrc_private := $(if $(wildcard $(recovery_initrc_private)), $(recovery_initrc_private),\
+    device/rockchip/common/recovery/etc/init.rc)
+recovery_initrc_emmc_private := $(TARGET_DEVICE_DIR)/recovery/etc/init.bootmode.emmc.rc
+recovery_initrc_emmc_private := $(if $(wildcard $(recovery_initrc_emmc_private)), $(recovery_initrc_emmc_private),\
+    device/rockchip/common/recovery/etc/init.bootmode.emmc.rc)
+recovery_initrc_mtd_private := $(TARGET_DEVICE_DIR)/recovery/etc/init.bootmode.unknown.rc
+recovery_initrc_mtd_private := $(if $(wildcard $(recovery_initrc_mtd_private)), $(recovery_initrc_mtd_private),\
+    device/rockchip/common/recovery/etc/init.bootmode.unknown.rc)
 recovery_sepolicy := $(call intermediates-dir-for,ETC,sepolicy.recovery)/sepolicy.recovery
 recovery_kernel := $(INSTALLED_KERNEL_TARGET) # same as a non-recovery system
 recovery_ramdisk := $(PRODUCT_OUT)/ramdisk-recovery.img
 recovery_build_prop := $(INSTALLED_BUILD_PROP_TARGET)
-recovery_binary := $(call intermediates-dir-for,EXECUTABLES,recovery)/recovery
+recovery_binary := $(call intermediates-dir-for,EXECUTABLES,recovery,,,$(TARGET_PREFER_32_BIT))/recovery
 recovery_resources_common := $(call include-path-for, recovery)/res

 # Set recovery_density to the density bucket of the device.
@@ -780,29 +843,64 @@ recovery_font := $(call include-path-for, recovery)/fonts/12x22.png
 endif

 recovery_resources_private := $(strip $(wildcard $(TARGET_DEVICE_DIR)/recovery/res))
+recovery_resources_private := $(if $(wildcard $(recovery_resources_private)), $(recovery_resources_private),\
+    device/rockchip/common/recovery/res)
 recovery_resource_deps := $(shell find $(recovery_resources_common) \
  $(recovery_resources_private) -type f)
 ifdef TARGET_RECOVERY_FSTAB
 recovery_fstab := $(TARGET_RECOVERY_FSTAB)
+#---------------- TARGET_BOARD_PLATFORM
+ifeq ($(TARGET_BOARD_PLATFORM),sofia3gr)
+TARGET_FSTAB_RECOVERY_NAME_EMMC := recovery.fstab_emmc
+TARGET_FSTAB_RECOVERY_NAME_NAND := recovery.fstab_nand
+recovery_fstab_mtd := $(TARGET_RECOVERY_FSTAB_NAND)
+else
+TARGET_FSTAB_RECOVERY_NAME_EMMC := recovery.fstab
+TARGET_FSTAB_RECOVERY_NAME_NAND := recovery.fstab
+recovery_fstab_mtd := $(TARGET_RECOVERY_FSTAB)
+endif
+#---------------- TARGET_BOARD_PLATFORM
 else
-recovery_fstab := $(strip $(wildcard $(TARGET_DEVICE_DIR)/recovery.fstab))
+recovery_fstab :=
+recovery_fstab_mtd := $(strip $(wildcard $(TARGET_DEVICE_DIR)/recovery.fstab))
+recovery_fstab_mtd := $(if $(wildcard $(recovery_fstab_mtd)), $(recovery_fstab_mtd),\
+    device/rockchip/common/recovery.fstab)
+recovery_fstab_emmc := $(strip $(wildcard $(TARGET_DEVICE_DIR)/recovery.emmc.fstab))
+recovery_fstab_emmc := $(if $(wildcard $(recovery_fstab_emmc)), $(recovery_fstab_emmc),\
+    device/rockchip/common/recovery.emmc.fstab)
 endif
+
+ifneq ($(strip $(TARGET_BOARD_PLATFORM)),sofia3gr)
 # Named '.dat' so we don't attempt to use imgdiff for patching it.
 RECOVERY_RESOURCE_ZIP := $(TARGET_OUT)/etc/recovery-resource.dat
+endif
+
+ifeq ($(TARGET_ROCKCHIP_PCBATEST),true)
+pcba_core := $(call intermediates-dir-for,EXECUTABLES,pcba_core)/pcba_core
+recovery_contents := $(TOPDIR)device/rockchip/common/recovery_contents.sh
+else
+recovery_contents := $(TOPDIR)device/rockchip/common/recovery_contents.sh
+endif

 ifeq ($(recovery_resources_private),)
  $(info No private recovery resources for TARGET_DEVICE $(TARGET_DEVICE))
 endif

+ifeq ($(recovery_fstab_mtd),)
 ifeq ($(recovery_fstab),)
  $(info No recovery.fstab for TARGET_DEVICE $(TARGET_DEVICE))
 endif
+endif

 INTERNAL_RECOVERYIMAGE_ARGS := \
-	$(addprefix --second ,$(INSTALLED_2NDBOOTLOADER_TARGET)) \
 	--kernel $(recovery_kernel) \
 	--ramdisk $(recovery_ramdisk)

+ifeq ($(strip $(TARGET_BOOTLOADER_IS_2ND)),true)
+INTERNAL_RECOVERYIMAGE_ARGS += \
+    $(addprefix --second ,$(INSTALLED_2NDBOOTLOADER_TARGET))
+endif
+
 # Assumes this has already been stripped
 ifdef BOARD_KERNEL_CMDLINE
  INTERNAL_RECOVERYIMAGE_ARGS += --cmdline "$(BOARD_KERNEL_CMDLINE)"
@@ -819,6 +917,11 @@ endif
 # build always uses dev-keys for this; release packaging tools will
 # substitute other keys for this one.
 OTA_PUBLIC_KEYS := $(DEFAULT_SYSTEM_DEV_CERTIFICATE).x509.pem
+ifeq ($(RECOVERY_UPDATEIMG_RSA_CHECK),true)
+RK_PUBLIC_KEY := build/target/product/security/publicKey.bin
+else
+RK_PUBLIC_KEY :=
+endif

 # Generate a file containing the keys that will be read by the
 # recovery binary.
@@ -827,21 +930,30 @@ RECOVERY_INSTALL_OTA_KEYS := \
 DUMPKEY_JAR := $(HOST_OUT_JAVA_LIBRARIES)/dumpkey.jar
 $(RECOVERY_INSTALL_OTA_KEYS): PRIVATE_OTA_PUBLIC_KEYS := $(OTA_PUBLIC_KEYS)
 $(RECOVERY_INSTALL_OTA_KEYS): extra_keys := $(patsubst %,%.x509.pem,$(PRODUCT_EXTRA_RECOVERY_KEYS))
-$(RECOVERY_INSTALL_OTA_KEYS): $(OTA_PUBLIC_KEYS) $(DUMPKEY_JAR) $(extra_keys)
+$(RECOVERY_INSTALL_OTA_KEYS): $(OTA_PUBLIC_KEYS) $(DUMPKEY_JAR) $(extra_keys) $(RK_PUBLIC_KEY) $(RADICAL_UPDATE_CERT)
 	@echo "DumpPublicKey: $@ <= $(PRIVATE_OTA_PUBLIC_KEYS) $(extra_keys)"
 	@rm -rf $@
 	@mkdir -p $(dir $@)
-	java -jar $(DUMPKEY_JAR) $(PRIVATE_OTA_PUBLIC_KEYS) $(extra_keys) > $@
+	java -jar $(DUMPKEY_JAR) $(PRIVATE_OTA_PUBLIC_KEYS) $(extra_keys) $(RADICAL_UPDATE_CERT) > $@

+ifeq ($(strip $(TARGET_BOOTLOADER_IS_2ND)),true)
+ifeq ($(TARGET_BOARD_PLATFORM),sofia3gr)
+$(INSTALLED_RECOVERYIMAGE_TARGET): $(INSTALLED_2NDBOOTLOADER_RECOVERY_TARGET)
+else
+$(INSTALLED_RECOVERYIMAGE_TARGET): $(INSTALLED_2NDBOOTLOADER_TARGET)
+endif
+endif
 $(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) \
 		$(INSTALLED_RAMDISK_TARGET) \
 		$(INSTALLED_BOOTIMAGE_TARGET) \
 		$(recovery_binary) \
 		$(recovery_initrc) $(recovery_sepolicy) $(recovery_kernel) \
-		$(INSTALLED_2NDBOOTLOADER_TARGET) \
 		$(recovery_build_prop) $(recovery_resource_deps) \
 		$(recovery_fstab) \
-		$(RECOVERY_INSTALL_OTA_KEYS)
+		$(recovery_fstab_mtd) \
+		$(recovery_fstab_emmc) \
+		$(RECOVERY_INSTALL_OTA_KEYS) \
+		$(pcba_core)
 	@echo ----- Making recovery image ------
 	$(hide) rm -rf $(TARGET_RECOVERY_OUT)
 	$(hide) mkdir -p $(TARGET_RECOVERY_OUT)
@@ -854,16 +966,27 @@ $(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) \
 	$(hide) rm -f $(TARGET_RECOVERY_ROOT_OUT)/sepolicy
 	$(hide) cp -f $(recovery_sepolicy) $(TARGET_RECOVERY_ROOT_OUT)/sepolicy
 	$(hide) -cp $(TARGET_ROOT_OUT)/init.recovery.*.rc $(TARGET_RECOVERY_ROOT_OUT)/
+	$(hide)cp -f $(recovery_initrc_private) $(TARGET_RECOVERY_ROOT_OUT)/
+	$(hide)cp -f $(recovery_initrc_emmc_private) $(TARGET_RECOVERY_ROOT_OUT)/
+	$(hide)cp -f $(recovery_initrc_mtd_private) $(TARGET_RECOVERY_ROOT_OUT)/
 	$(hide) cp -f $(recovery_binary) $(TARGET_RECOVERY_ROOT_OUT)/sbin/
 	$(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/res
 	$(hide) rm -rf $(TARGET_RECOVERY_ROOT_OUT)/res/*
 	$(hide) cp -rf $(recovery_resources_common)/* $(TARGET_RECOVERY_ROOT_OUT)/res
 	$(hide) cp -f $(recovery_font) $(TARGET_RECOVERY_ROOT_OUT)/res/images/font.png
+	$(recovery_contents) $(TARGET_PRODUCT) $(PRODUCT_OUT) $(TARGET_BOARD_PLATFORM) $(TARGET_ROCKCHIP_PCBATEST) $(TARGET_ARCH)
 	$(hide) $(foreach item,$(recovery_resources_private), \
 	  cp -rf $(item) $(TARGET_RECOVERY_ROOT_OUT)/)
 	$(hide) $(foreach item,$(recovery_fstab), \
-	  cp -f $(item) $(TARGET_RECOVERY_ROOT_OUT)/etc/recovery.fstab)
+	  cp -f $(item) $(TARGET_RECOVERY_ROOT_OUT)/etc/$(TARGET_FSTAB_RECOVERY_NAME_EMMC))
+	$(hide) $(foreach item,$(recovery_fstab_mtd), \
+	  cp -f $(item) $(TARGET_RECOVERY_ROOT_OUT)/etc/$(TARGET_FSTAB_RECOVERY_NAME_NAND))
+	$(hide) $(foreach item,$(recovery_fstab_emmc), \
+	  cp -f $(item) $(TARGET_RECOVERY_ROOT_OUT)/etc/recovery.emmc.fstab)
 	$(hide) cp $(RECOVERY_INSTALL_OTA_KEYS) $(TARGET_RECOVERY_ROOT_OUT)/res/keys
+ifeq ($(RECOVERY_UPDATEIMG_RSA_CHECK),true)
+	cp  $(RK_PUBLIC_KEY) $(TARGET_RECOVERY_ROOT_OUT)/res/
+endif
 	$(hide) cat $(INSTALLED_DEFAULT_PROP_TARGET) $(recovery_build_prop) \
 	        > $(TARGET_RECOVERY_ROOT_OUT)/default.prop
 	$(hide) $(MKBOOTFS) $(TARGET_RECOVERY_ROOT_OUT) | $(MINIGZIP) > $(recovery_ramdisk)
@@ -876,7 +999,8 @@ endif

 $(RECOVERY_RESOURCE_ZIP): $(INSTALLED_RECOVERYIMAGE_TARGET)
 	$(hide) mkdir -p $(dir $@)
-	$(hide) find $(TARGET_RECOVERY_ROOT_OUT)/res -type f | sort | zip -0qrj $@ -@
+	@echo "the @ is: $@"
+	$(hide) find $(TARGET_RECOVERY_ROOT_OUT)/res -type f | sort #| zip -0qrj $@ -@

 else
 INSTALLED_RECOVERYIMAGE_TARGET :=
@@ -1247,6 +1371,10 @@ ifeq ($(TARGET_USE_DISKINSTALLER),true)
 include bootable/diskinstaller/config.mk
 endif

+ifeq ($(strip $(TARGET_USE_USERFASTBOOT)),true)
+include bootable/userfastboot/ramdisk.mk
+endif
+
 # -----------------------------------------------------------------
 # host tools needed to build dist and OTA packages

@@ -1258,6 +1386,9 @@ DISTTOOLS :=  $(HOST_OUT_EXECUTABLES)/minigzip \
 	  $(HOST_OUT_EXECUTABLES)/zipalign \
 	  $(HOST_OUT_EXECUTABLES)/bsdiff \
 	  $(HOST_OUT_EXECUTABLES)/imgdiff \
+	  $(HOST_OUT_EXECUTABLES)/remkloader \
+	  $(HOST_OUT_EXECUTABLES)/mkparameter \
+	  $(HOST_OUT_EXECUTABLES)/drmsigntool \
 	  $(HOST_OUT_JAVA_LIBRARIES)/dumpkey.jar \
 	  $(HOST_OUT_JAVA_LIBRARIES)/signapk.jar \
 	  $(HOST_OUT_EXECUTABLES)/mkuserimg.sh \
@@ -1303,11 +1434,11 @@ define package_files-copy-root
 endef

 built_ota_tools := \
-	$(call intermediates-dir-for,EXECUTABLES,applypatch)/applypatch \
-	$(call intermediates-dir-for,EXECUTABLES,applypatch_static)/applypatch_static \
-	$(call intermediates-dir-for,EXECUTABLES,check_prereq)/check_prereq \
-	$(call intermediates-dir-for,EXECUTABLES,sqlite3)/sqlite3 \
-	$(call intermediates-dir-for,EXECUTABLES,updater)/updater
+	$(call intermediates-dir-for,EXECUTABLES,applypatch,,,$(TARGET_PREFER_32_BIT))/applypatch \
+	$(call intermediates-dir-for,EXECUTABLES,applypatch_static,,,$(TARGET_PREFER_32_BIT))/applypatch_static \
+	$(call intermediates-dir-for,EXECUTABLES,check_prereq,,,$(TARGET_PREFER_32_BIT))/check_prereq \
+	$(call intermediates-dir-for,EXECUTABLES,sqlite3,,,$(TARGET_PREFER_32_BIT))/sqlite3 \
+	$(call intermediates-dir-for,EXECUTABLES,updater,,,$(TARGET_PREFER_32_BIT))/updater
 $(BUILT_TARGET_FILES_PACKAGE): PRIVATE_OTA_TOOLS := $(built_ota_tools)

 $(BUILT_TARGET_FILES_PACKAGE): PRIVATE_RECOVERY_API_VERSION := $(RECOVERY_API_VERSION)
@@ -1325,6 +1456,10 @@ endif
 $(BUILT_TARGET_FILES_PACKAGE): \
 		$(INSTALLED_BOOTIMAGE_TARGET) \
 		$(INSTALLED_RADIOIMAGE_TARGET) \
+		$(INSTALLED_LOADER_TARGET) \
+		$(INSTALLED_UBOOT_TARGET) \
+		$(INSTALLED_CHARGE_TARGET) \
+		$(INSTALLED_PARAMETER_TARGET) \
 		$(INSTALLED_RECOVERYIMAGE_TARGET) \
 		$(INSTALLED_SYSTEMIMAGE) \
 		$(INSTALLED_USERDATAIMAGE_TARGET) \
@@ -1347,9 +1482,14 @@ ifdef INSTALLED_KERNEL_TARGET
 	$(hide) $(ACP) $(INSTALLED_KERNEL_TARGET) $(zip_root)/RECOVERY/kernel
 endif
 ifdef INSTALLED_2NDBOOTLOADER_TARGET
+ifeq ($(TARGET_BOARD_PLATFORM),sofia3gr)
+	$(hide) $(ACP) \
+		$(INSTALLED_2NDBOOTLOADER_RECOVERY_TARGET) $(zip_root)/RECOVERY/second
+else
 	$(hide) $(ACP) \
 		$(INSTALLED_2NDBOOTLOADER_TARGET) $(zip_root)/RECOVERY/second
 endif
+endif
 ifdef BOARD_KERNEL_CMDLINE
 	$(hide) echo "$(BOARD_KERNEL_CMDLINE)" > $(zip_root)/RECOVERY/cmdline
 endif
@@ -1370,6 +1510,14 @@ ifdef INSTALLED_2NDBOOTLOADER_TARGET
 	$(hide) $(ACP) \
 		$(INSTALLED_2NDBOOTLOADER_TARGET) $(zip_root)/BOOT/second
 endif
+
+ifdef INSTALLED_3NDBOOTLOADER_TARGET
+ifeq ($(TARGET_BOARD_PLATFORM),sofia3gr)
+	$(hide) $(ACP) \
+		$(INSTALLED_3NDBOOTLOADER_TARGET) $(zip_root)/BOOT/third
+endif
+endif
+
 ifdef BOARD_KERNEL_CMDLINE
 	$(hide) echo "$(BOARD_KERNEL_CMDLINE)" > $(zip_root)/BOOT/cmdline
 endif
@@ -1382,6 +1530,47 @@ endif
 	$(hide) $(foreach t,$(INSTALLED_RADIOIMAGE_TARGET),\
 	            mkdir -p $(zip_root)/RADIO; \
 	            $(ACP) $(t) $(zip_root)/RADIO/$(notdir $(t));)
+ifeq ($(INSTALLED_LOADER_TARGET),)
+	$(info No RK Loader for TARGET_DEVICE $(TARGET_DEVICE) to otapackage)
+else
+	@# Contents of the rk loader bin
+	$(hide) mkdir -p $(zip_root)/LOADER
+	$(hide) $(HOST_OUT_EXECUTABLES)/remkloader '$(INSTALLED_LOADER_TARGET)' $(INSTALLED_NEW_LOADER_TARGET)
+	$(hide) cat $(INSTALLED_LOADER_MISC_TARGET) $(INSTALLED_NEW_LOADER_TARGET) > $(zip_root)/LOADER/RKLoader.img 
+endif
+
+ifdef TARGET_PREBUILT_RESOURCE
+	$(info package add resource.img to BOOT and RECOVERY)
+	$(hide) cp $(TARGET_PREBUILT_RESOURCE) $(zip_root)/BOOT/resource.img
+	$(hide) cp $(TARGET_PREBUILT_RESOURCE) $(zip_root)/RECOVERY/resource.img
+endif
+
+ifeq ($(INSTALLED_UBOOT_TARGET),)
+	$(info No uboot for uboot/uboot.img to otapackage)
+else
+	$(hide) cp $(INSTALLED_UBOOT_TARGET) $(zip_root)/uboot.img
+endif
+
+ifeq ($(INSTALLED_TRUST_TARHET),)
+	$(info No trust for uboot/trust.img to otapackage)
+else
+	$(hide) cp $(INSTALLED_TRUST_TARHET) $(zip_root)/trust.img
+endif
+
+ifeq ($(INSTALLED_CHARGE_TARGET),)
+	$(info No charge for uboot/charge.img to otapackage)
+else
+	$(hide) cp $(INSTALLED_CHARGE_TARGET) $(zip_root)/charge.img
+endif
+
+ifeq ($(INSTALLED_PARAMETER_TARGET),)
+	$(info No parameter for TARGET_DEVICE $(TARGET_DEVICE) to otapackage)
+else
+	$(hide) rm -rf $(zip_root)/PARAMETER
+	$(hide) mkdir -p $(zip_root)/PARAMETER
+	$(hide) $(HOST_OUT_EXECUTABLES)/mkparameter '$(INSTALLED_PARAMETER_TARGET)' $(zip_root)/PARAMETER/parameter
+endif	
+
 	@# Contents of the system image
 	$(hide) $(call package_files-copy-root, \
 		$(SYSTEMIMAGE_SOURCE_DIR),$(zip_root)/SYSTEM)
@@ -1420,7 +1609,7 @@ ifdef TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS
 else
 	$(hide) echo "recovery_mount_options=$(DEFAULT_TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS)" >> $(zip_root)/META/misc_info.txt
 endif
-	$(hide) echo "tool_extensions=$(tool_extensions)" >> $(zip_root)/META/misc_info.txt
+	$(hide) echo "tool_extensions=$(tool_extensions)/releasetools.py" >> $(zip_root)/META/misc_info.txt
 	$(hide) echo "default_system_dev_certificate=$(DEFAULT_SYSTEM_DEV_CERTIFICATE)" >> $(zip_root)/META/misc_info.txt
 ifdef PRODUCT_EXTRA_RECOVERY_KEYS
 	$(hide) echo "extra_recovery_keys=$(PRODUCT_EXTRA_RECOVERY_KEYS)" >> $(zip_root)/META/misc_info.txt
@@ -1435,7 +1624,9 @@ ifneq ($(OEM_THUMBPRINT_PROPERTIES),)
 	$(hide) echo "oem_fingerprint_properties=$(OEM_THUMBPRINT_PROPERTIES)" >> $(zip_root)/META/misc_info.txt
 endif
 	$(call generate-userimage-prop-dictionary, $(zip_root)/META/misc_info.txt)
+ifneq ($(strip $(TARGET_BOARD_PLATFORM)),sofia3gr)
 	$(hide) ./build/tools/releasetools/make_recovery_patch $(zip_root) $(zip_root)
+endif
 	@# Zip everything up, preserving symlinks
 	$(hide) (cd $(zip_root) && zip -qry ../$(notdir $@) .)
 	@# Run fs_config on all the system, vendor, boot ramdisk,
@@ -1457,7 +1648,7 @@ endif
 ifneq ($(TARGET_PRODUCT),sdk)
 ifeq ($(filter generic%,$(TARGET_DEVICE)),)
 ifneq ($(TARGET_NO_KERNEL),true)
-ifneq ($(recovery_fstab),)
+ifneq ($(recovery_fstab_mtd),)

 # -----------------------------------------------------------------
 # OTA update package
@@ -1476,7 +1667,6 @@ $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS)
 	@echo "Package OTA: $@"
 	$(hide) MKBOOTIMG=$(MKBOOTIMG) \
 	   ./build/tools/releasetools/ota_from_target_files -v \
-	   --block \
 	   -p $(HOST_OUT) \
 	   -k $(KEY_CERT_PAIR) \
 	   $(if $(OEM_OTA_CONFIG), -o $(OEM_OTA_CONFIG)) \

--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.

-export BUILD_ID=LMY47O
+export BUILD_ID=LMY49F
--- a/core/clang/config.mk
+++ b/core/clang/config.mk
@@ -42,6 +42,11 @@ CLANG_CONFIG_EXTRA_CFLAGS += \
 CLANG_CONFIG_EXTRA_CFLAGS += \
  -Werror=int-conversion

+# Workaround for ccache with clang.
+# See http://petereisentraut.blogspot.com/2011/05/ccache-and-clang.html.
+CLANG_CONFIG_EXTRA_CFLAGS += \
+  -Wno-unused-command-line-argument
+
 CLANG_CONFIG_UNKNOWN_CFLAGS := \
  -funswitch-loops \
  -fno-tree-sra \

--- a/core/cleanbuild.mk
+++ b/core/cleanbuild.mk
@@ -204,6 +204,7 @@ installclean_files := \
 	$(PRODUCT_OUT)/system \
 	$(PRODUCT_OUT)/vendor \
 	$(PRODUCT_OUT)/oem \
+	$(PRODUCT_OUT)/userfastboot \
 	$(PRODUCT_OUT)/dex_bootjars \
 	$(PRODUCT_OUT)/obj/JAVA_LIBRARIES \
 	$(PRODUCT_OUT)/obj/FAKE \

--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -149,6 +149,8 @@ LOCAL_PREBUILT_MODULE_FILE:=
 LOCAL_POST_INSTALL_CMD:=
 LOCAL_DIST_BUNDLED_BINARIES:=
 LOCAL_HAL_STATIC_LIBRARIES:=
+LOCAL_ADD_ENCED_PLATFORM_KEYS_TO_APK:=
+LOCAL_PUBLIC_KEY_TO_ENC_RANDOM_PROTECTION_KEY:=
 LOCAL_RMTYPEDEFS:=
 LOCAL_NO_SYNTAX_CHECK:=
 LOCAL_NO_STATIC_ANALYZER:=

--- a/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
@@ -49,6 +49,21 @@ $(combo_2nd_arch_prefix)TARGET_TOOLCHAIN_ROOT := prebuilts/gcc/$(HOST_PREBUILT_T
 $(combo_2nd_arch_prefix)TARGET_TOOLS_PREFIX := $($(combo_2nd_arch_prefix)TARGET_TOOLCHAIN_ROOT)/bin/x86_64-linux-android-
 endif

+ifeq ($(TARGET_KERNEL_ARCH),x86_64)
+TARGET_KERNEL_TOOLCHAIN_ROOT := prebuilts/gcc/$(HOST_PREBUILT_TAG)/host/x86_64-linux-glibc2.7-4.6
+TARGET_KERNEL_TOOLS_PREFIX := $(TARGET_KERNEL_TOOLCHAIN_ROOT)/bin/x86_64-linux-
+else
+TARGET_KERNEL_TOOLCHAIN_ROOT := $(TARGET_TOOLCHAIN_ROOT)
+TARGET_KERNEL_TOOLS_PREFIX := $(TARGET_TOOLS_PREFIX)
+endif
+
+ifeq ($(TARGET_BUILD_VARIANT),user)
+TARGET_STRIP_COMMAND = $(TARGET_STRIP) --strip-all $< -o $@
+else
+TARGET_STRIP_COMMAND = $(TARGET_STRIP) --strip-debug $< -o $@ && \
+	$(TARGET_OBJCOPY) --add-gnu-debuglink=$< $@
+endif
+
 $(combo_2nd_arch_prefix)TARGET_CC := $($(combo_2nd_arch_prefix)TARGET_TOOLS_PREFIX)gcc$(HOST_EXECUTABLE_SUFFIX)
 $(combo_2nd_arch_prefix)TARGET_CXX := $($(combo_2nd_arch_prefix)TARGET_TOOLS_PREFIX)g++$(HOST_EXECUTABLE_SUFFIX)
 $(combo_2nd_arch_prefix)TARGET_AR := $($(combo_2nd_arch_prefix)TARGET_TOOLS_PREFIX)ar$(HOST_EXECUTABLE_SUFFIX)

--- a/core/combo/arch/x86/haswell.mk
+++ b/core/combo/arch/x86/haswell.mk
@@ -7,6 +7,9 @@ ARCH_X86_HAVE_SSE4_1 := true
 ARCH_X86_HAVE_SSE4_2 := true
 ARCH_X86_HAVE_AES_NI := true
 ARCH_X86_HAVE_AVX    := true
+ARCH_X86_HAVE_AVX2   := true
+ARCH_X86_HAVE_POPCNT := true
+ARCH_X86_HAVE_MOVBE  := true

 # CFLAGS for this arch
 arch_variant_cflags := \

--- a/core/combo/arch/x86_64/haswell.mk
+++ b/core/combo/arch/x86_64/haswell.mk
@@ -7,6 +7,9 @@ ARCH_X86_HAVE_SSE4_1 := true
 ARCH_X86_HAVE_SSE4_2 := true
 ARCH_X86_HAVE_AES_NI := true
 ARCH_X86_HAVE_AVX    := true
+ARCH_X86_HAVE_AVX2   := true
+ARCH_X86_HAVE_POPCNT := true
+ARCH_X86_HAVE_MOVBE  := true

 # CFLAGS for this arch
 arch_variant_cflags := \

--- a/core/config.mk
+++ b/core/config.mk
@@ -551,6 +551,28 @@ TARGET_CPU_SMP ?= true
 DEX2OAT_TARGET_ARCH := $(TARGET_ARCH)
 DEX2OAT_TARGET_CPU_VARIANT := $(TARGET_CPU_VARIANT)
 DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := default
+
+ifeq ($(ARCH_X86_HAVE_SSSE3),true)
+  DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := ssse3
+endif
+ifeq ($(ARCH_X86_HAVE_SSE4_2),true)
+  DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := sse4_2
+endif
+ifeq ($(ARCH_X86_HAVE_AVX),true)
+  DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := avx
+endif
+ifeq ($(ARCH_X86_HAVE_AVX2),true)
+  DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := avx2
+endif
+ifeq ($(ARCH_X86_HAVE_AES_NI),true)
+  DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := $(DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES)$(comma)aes_in
+endif
+ifeq ($(ARCH_X86_HAVE_POPCNT),true)
+  DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := $(DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES)$(comma)popcnt
+endif
+ifeq ($(ARCH_X86_HAVE_MOVBE),true)
+  DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := $(DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES)$(comma)movbe
+endif
 ifneq (,$(filter $(DEX2OAT_TARGET_CPU_VARIANT),cortex-a7 cortex-a15 krait denver))
  DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := div
 endif

--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1790,6 +1790,35 @@ $(hide) if [ -d $(PRIVATE_CLASS_INTERMEDIATES_DIR) ] ; then \
 fi
 endef

+# 在 intermediates 目录下, 生成随机的 prt_key_for_PPrK
+#
+define gen-random-prt_key_for_PPrK
+echo -n $$RANDOM > $(prt_key_for_PPrK)
+echo -n $$RANDOM >> $(prt_key_for_PPrK)
+echo -n $$RANDOM >> $(prt_key_for_PPrK)
+endef
+
+# enc platform_PrK, then add keys to apk in assets.
+#
+define add-enced-platform-keys-to-package
+$(hide)# 在 intermediates 目录下创建 assets 目录
+@mkdir -p $(assets_dir)
+# 在 intermediates 目录下, 生成随机的 prt_key_for_PPrK
+$(gen-random-prt_key_for_PPrK)
+# 使用 prt_key_for_PPrK, 对 platform_PrK 加密, 得到 enced_platform_PrK, 保存在 assets 下
+openssl enc -aes-128-cbc -in $(platform_PrK) -out $(enced_platform_PrK) -pass file:$(prt_key_for_PPrK)
+# 使用 PuK_to_enc_PrtK, 对 prt_key_for_PPrK 加密, 得到 enced_PrtK, 保存在 assets 下
+openssl rsautl -encrypt -in $(prt_key_for_PPrK) -inkey $(PuK_to_enc_PrtK) -pubin -out $(enced_PrtK)
+# 将 platform_cert 拷贝到 assets 下
+cp $(platform_cert) $(assets_dir)/platform_cert
+# 将 目录 assets 中的文件都添加到 apk 中.
+{ cd $(intermediate_dir); zip $(notdir $@) assets/*; cd -;}
+# 删除 prt_key_for_PPrK.
+rm $(prt_key_for_PPrK)
+# 删除 目录 assets.
+rm $(assets_dir) -rf
+endef
+
 # Sign a package using the specified key/cert.
 #
 define sign-package
@@ -1887,19 +1916,20 @@ endef
 # Copy a single file from one place to another,
 # preserving permissions and overwriting any existing
 # file.
+# If files are identical then don't copy.
 # We disable the "-t" option for acp cannot handle
 # high resolution timestamp correctly on file systems like ext4.
 # Therefore copy-file-to-target is the same as copy-file-to-new-target.
 define copy-file-to-target
 @mkdir -p $(dir $@)
-$(hide) $(ACP) -fp $< $@
+$(hide)(cmp -s $< $@ ; if [ $$? -ne 0 ] ; then $(ACP) -fp $< $@ ; fi)
 endef

 # The same as copy-file-to-target, but use the local
 # cp command instead of acp.
 define copy-file-to-target-with-cp
 @mkdir -p $(dir $@)
-$(hide) cp -fp $< $@
+$(hide)(cmp -s $< $@ ; if [ $$? -ne 0 ] ; then cp -fp $< $@ ; fi)
 endef

 # The same as copy-file-to-target, but use the zipalign tool to do so.
@@ -2211,6 +2241,7 @@ include $(BUILD_SYSTEM)/distdir.mk

 # Include any vendor specific definitions.mk file
 -include $(TOPDIR)vendor/*/build/core/definitions.mk
+-include $(TOPDIR)device/*/build/core/definitions.mk

 # broken:
 #	$(foreach file,$^,$(if $(findstring,.a,$(suffix $file)),-l$(file),$(file)))

--- a/core/dex_preopt_libart.mk
+++ b/core/dex_preopt_libart.mk
@@ -26,7 +26,12 @@ COMPILED_CLASSES := $(call word-colon,1,$(firstword \

 # start of image reserved address space
 LIBART_IMG_HOST_BASE_ADDRESS   := 0x60000000
+
+ifeq ($(strip $(TARGET_BOARD_PLATFORM)),sofia3gr)
+LIBART_IMG_TARGET_BASE_ADDRESS := 0x30000000
+else
 LIBART_IMG_TARGET_BASE_ADDRESS := 0x70000000
+endif

 define get-product-default-property
 $(strip $(patsubst $(1)=%,%,$(filter $(1)=%,$(PRODUCT_DEFAULT_PROPERTY_OVERRIDES))))

--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -221,6 +221,14 @@ HOST_OUT_ROOT := $(HOST_OUT_ROOT_$(HOST_BUILD_TYPE))
 HOST_OUT_release := $(HOST_OUT_ROOT_release)/$(HOST_OS)-$(HOST_PREBUILT_ARCH)
 HOST_OUT_debug := $(HOST_OUT_ROOT_debug)/$(HOST_OS)-$(HOST_PREBUILT_ARCH)
 HOST_OUT := $(HOST_OUT_$(HOST_BUILD_TYPE))
+ifeq ($(strip $(ANDROID_HOST_OUT)), )
+HOST_OUT_IS_ABS=$(shell if [ -d $(shell pwd)/$(HOST_OUT) ] ; then echo "false" ; else echo "true"; fi )
+ifeq ($(strip $(HOST_OUT_IS_ABS)), false)
+ANDROID_HOST_OUT := $(shell pwd)/$(HOST_OUT)
+else
+ANDROID_HOST_OUT := $(HOST_OUT)
+endif
+endif

 BUILD_OUT := $(OUT_DIR)/host/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)


--- a/core/main.mk
+++ b/core/main.mk
@@ -174,7 +174,8 @@ endif
 requires_openjdk := false
 ifeq ($(LEGACY_USE_JAVA6),)
 ifeq ($(HOST_OS), linux)
-requires_openjdk := true
+# Oracle JDK7 works fine on linux.
+requires_openjdk := false
 endif
 endif

@@ -191,6 +192,7 @@ $(info ************************************************************)
 $(error stop)
 endif # java version is not OpenJdk
 else # if requires_openjdk
+ifneq ($(LEGACY_USE_JAVA6),)
 ifneq ($(shell echo '$(java_version_str)' | grep -i openjdk),)
 $(info ************************************************************)
 $(info You are attempting to build with an unsupported JDK.)
@@ -201,6 +203,7 @@ $(info $(space)$(space)$(space)$(space)https://source.android.com/source/downloa
 $(info ************************************************************)
 $(error stop)
 endif # java version is not Sun Oracle JDK
+endif
 endif # if requires_openjdk

 # Check for the correct version of javac

--- a/core/prebuilt_internal.mk
+++ b/core/prebuilt_internal.mk
@@ -180,11 +180,27 @@ endif
 include $(BUILD_SYSTEM)/dex_preopt_odex_install.mk
 #######################################
 # Sign and align non-presigned .apks.
+# rk_ext : ru : add_enced_platform_key_to_apk
+ifeq ($(LOCAL_ADD_ENCED_PLATFORM_KEYS_TO_APK),true)
+$(info "to add enced_platform_keys to apk!")
+ifdef LOCAL_PUBLIC_KEY_TO_ENC_RANDOM_PROTECTION_KEY
+PuK_to_enc_PrtK := $(LOCAL_PUBLIC_KEY_TO_ENC_RANDOM_PROTECTION_KEY)
+$(info "PuK_to_enc_PrtK : " $(PuK_to_enc_PrtK) )
+$(info "built_module : " $(built_module) )
+intermediate_dir := $(dir $(built_module) )
+assets_dir := $(intermediate_dir)/assets
+prt_key_for_PPrK := $(intermediate_dir)/prt_key_for_PPrK
+platform_PrK := build/target/product/security/platform.pk8
+platform_cert := build/target/product/security/platform.x509.pem
+enced_platform_PrK := $(assets_dir)/enced_platform_PrK
+enced_PrtK := $(assets_dir)/enced_PrtK
+# Add enced_platform_keys, sign and align non-presigned .apks.
 $(built_module) : $(my_prebuilt_src_file) | $(ACP) $(ZIPALIGN) $(SIGNAPK_JAR)
 	$(transform-prebuilt-to-target)
 ifdef extracted_jni_libs
 	$(hide) zip -d $@ 'lib/*.so'  # strip embedded JNI libraries.
 endif
+	$(add-enced-platform-keys-to-package)
 ifneq ($(LOCAL_CERTIFICATE),PRESIGNED)
 	$(sign-package)
 endif
@@ -194,6 +210,25 @@ ifneq (nostripping,$(LOCAL_DEX_PREOPT))
 endif
 endif
 	$(align-package)
+else	# ifdef LOCAL_PUBLIC_KEY_TO_ENC_RANDOM_PROTECTION_KEY
+$(error "no LOCAL_PUBLIC_KEY_TO_ENC_RANDOM_PROTECTION_KEY specified!")
+endif
+else	# ifeq ($(LOCAL_ADD_ENCED_PLATFORM_KEYS_TO_APK),true)
+$(built_module) : $(my_prebuilt_src_file) | $(ACP) $(ZIPALIGN) $(SIGNAPK_JAR)
+	$(transform-prebuilt-to-target)
+ifdef extracted_jni_libs
+	$(hide) zip -d $@ 'lib/*.so'  # strip embedded JNI libraries.
+endif
+ifneq ($(LOCAL_CERTIFICATE),PRESIGNED)
+	$(sign-package)
+endif
+ifdef LOCAL_DEX_PREOPT
+ifneq (nostripping,$(LOCAL_DEX_PREOPT))
+	$(call dexpreopt-remove-classes.dex,$@)
+endif
+endif
+	$(align-package)
+endif	# ifeq ($(LOCAL_ADD_ENCED_PLATFORM_KEYS_TO_APK),true)

 ###############################
 ## Rule to build the odex file

--- a/core/root.mk
+++ b/core/root.mk
 ### DO NOT EDIT THIS FILE ###
 include build/core/main.mk
+-include device/rockchip/common/prebuild.mk
 ### DO NOT EDIT THIS FILE ###
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -24,6 +24,7 @@
 #     DEFAULT_APP_TARGET_SDK
 #     BUILD_ID
 #     BUILD_NUMBER
+#     SECURITY_PATCH
 #

 # Look for an optional file containing overrides of the defaults,
@@ -41,7 +42,7 @@ ifeq "" "$(PLATFORM_VERSION)"
  # which is the version that we reveal to the end user.
  # Update this value when the platform version changes (rather
  # than overriding it somewhere else).  Can be an arbitrary string.
-  PLATFORM_VERSION := 5.1
+  PLATFORM_VERSION := 5.1.1
 endif

 ifeq "" "$(PLATFORM_SDK_VERSION)"
@@ -67,6 +68,22 @@ ifeq "" "$(PLATFORM_VERSION_CODENAME)"
  PLATFORM_VERSION_ALL_CODENAMES := $(PLATFORM_VERSION_CODENAME)
 endif

+ifeq "" "$(PLATFORM_SECURITY_PATCH)"
+  # Used to indicate the security patch that has been applied to the device.
+  # Can be an arbitrary string, but must be a single word.
+  #
+  # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
+  PLATFORM_SECURITY_PATCH := 2016-03-01
+endif
+
+ifeq "" "$(PLATFORM_BASE_OS)"
+  # Used to indicate the base os applied to the device.
+  # Can be an arbitrary string, but must be a single word.
+  #
+  # If there is no $PLATFORM_BASE_OS set, keep it empty.
+  PLATFORM_BASE_OS :=
+endif
+
 ifeq "" "$(DEFAULT_APP_TARGET_SDK)"
  # This is the default minSdkVersion and targetSdkVersion to use for
  # all .apks created by the build system.  It can be overridden by explicitly

--- a/envsetup.sh
+++ b/envsetup.sh
@@ -452,12 +452,12 @@ function add_lunch_combo()
 }

 # add the default one here
-add_lunch_combo aosp_arm-eng
-add_lunch_combo aosp_arm64-eng
-add_lunch_combo aosp_mips-eng
-add_lunch_combo aosp_mips64-eng
-add_lunch_combo aosp_x86-eng
-add_lunch_combo aosp_x86_64-eng
+#add_lunch_combo aosp_arm-eng
+#add_lunch_combo aosp_arm64-eng
+#add_lunch_combo aosp_mips-eng
+#add_lunch_combo aosp_mips64-eng
+#add_lunch_combo aosp_x86-eng
+#add_lunch_combo aosp_x86_64-eng

 function print_lunch_menu()
 {
@@ -1663,7 +1663,11 @@ function set_java_home() {
                export JAVA_HOME=$(/usr/libexec/java_home -v 1.7)
                ;;
            *)
-                export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64
+                if [ -d /usr/lib/jvm/java-7-openjdk-amd64 ]; then
+                    export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64
+                elif [ -d /usr/lib/jvm/java-7-sun ]; then
+                    export JAVA_HOME=/usr/lib/jvm/java-7-sun
+                fi
                ;;
        esac
      fi

--- a/target/product/aosp_x86.mk
+++ b/target/product/aosp_x86.mk
@@ -16,3 +16,9 @@
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_x86.mk)

 PRODUCT_NAME := aosp_x86
+
+##############################################################
+# This is needed to enable silver art optimizer.
+# This will build the plugins/libart-extension.so library,  which is dynamically loaded by
+# AOSP and contains Intel optimizations to the compiler.
+PRODUCT_PACKAGES += libart-extension
--- a/target/product/aosp_x86_64.mk
+++ b/target/product/aosp_x86_64.mk
@@ -16,3 +16,9 @@
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_x86_64.mk)

 PRODUCT_NAME := aosp_x86_64
+
+##############################################################
+# This is needed to enable silver art optimizer.
+# This will build the plugins/libart-extension.so library,  which is dynamically loaded by
+# AOSP and contains Intel optimizations to the compiler.
+PRODUCT_PACKAGES += libart-extension