Merge remote-tracking branch 'github/cm-11.0' into HEAD (98dc43d3) · Commits · e / os / android_build

core/Makefile

+11 −1

Original line number	Diff line number	Diff line
		@@ -1293,6 +1293,9 @@ $(BUILT_TARGET_FILES_PACKAGE): \
		ifdef INSTALLED_KERNEL_TARGET
		$(hide) $(ACP) $(INSTALLED_KERNEL_TARGET) $(zip_root)/RECOVERY/kernel
		endif
		ifdef INSTALLED_DTIMAGE_TARGET
		$(hide) $(ACP) $(INSTALLED_DTIMAGE_TARGET) $(zip_root)/RECOVERY/dt
		endif
		ifdef INSTALLED_2NDBOOTLOADER_TARGET
		$(hide) $(ACP) \
		$(INSTALLED_2NDBOOTLOADER_TARGET) $(zip_root)/RECOVERY/second
		@@ -1314,6 +1317,9 @@ endif
		ifdef INSTALLED_KERNEL_TARGET
		$(hide) $(ACP) $(INSTALLED_KERNEL_TARGET) $(zip_root)/BOOT/kernel
		endif
		ifdef INSTALLED_DTIMAGE_TARGET
		$(hide) $(ACP) $(INSTALLED_DTIMAGE_TARGET) $(zip_root)/BOOT/dt
		endif
		ifdef INSTALLED_RAMDISK_TARGET
		$(hide) $(ACP) $(INSTALLED_RAMDISK_TARGET) $(zip_root)/BOOT/ramdisk.img
		endif
		@@ -1380,6 +1386,11 @@ endif
		$(hide) echo "use_set_metadata=1" >> $(zip_root)/META/misc_info.txt
		$(hide) echo "update_rename_support=1" >> $(zip_root)/META/misc_info.txt
		$(call generate-userimage-prop-dictionary, $(zip_root)/META/misc_info.txt)
		ifdef PRODUCT_DEFAULT_DEV_CERTIFICATE
		$(hide) build/tools/getb64key.py $(PRODUCT_DEFAULT_DEV_CERTIFICATE).x509.pem > $(zip_root)/META/releasekey.txt
		else
		$(hide) build/tools/getb64key.py $(DEFAULT_SYSTEM_DEV_CERTIFICATE).x509.pem > $(zip_root)/META/releasekey.txt
		endif
		@# Zip everything up, preserving symlinks
		$(hide) (cd $(zip_root) && zip -qry ../$(notdir $@) .)
		@# Run fs_config on all the system, boot ramdisk, and recovery ramdisk files in the zip, and save the output
		@@ -1439,7 +1450,6 @@ endif
		$(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS)
		@echo "$(OTA_FROM_TARGET_SCRIPT)" > $(PRODUCT_OUT)/ota_script_path
		@echo "$(override_device)" > $(PRODUCT_OUT)/ota_override_device
		@echo "$(BOARD_CUSTOM_BOOTIMG_MK)" > $(PRODUCT_OUT)/ota_custom_bootimg_mk
		@echo -e ${CL_YLW}"Package OTA:"${CL_RST}" $@"
		MKBOOTIMG=$(BOARD_CUSTOM_BOOTIMG_MK) \
		$(OTA_FROM_TARGET_SCRIPT) -v \

core/definitions.mk

+12 −3

Original line number	Diff line number	Diff line
		@@ -1501,7 +1501,11 @@ $(hide) if [ -s $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq ] ; the
		-extdirs "" -d $(PRIVATE_CLASS_INTERMEDIATES_DIR) \
		$(PRIVATE_JAVACFLAGS) \
		\@$(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq \
		\|\| ( rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR) ; exit 41 ) \
		2>$(PRIVATE_CLASS_INTERMEDIATES_DIR)/stderr \
		&& rm -f $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stderr \
		\|\| ( if [ -e $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stderr ]; then \
		echo -e ${CL_RED}"`cat $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stderr`"${CL_RST} 1>&2; \
		fi; rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR); exit 41 ) \
		fi
		$(if $(PRIVATE_JAVA_LAYERS_FILE), $(hide) build/tools/java-layers.py \
		$(PRIVATE_JAVA_LAYERS_FILE) \@$(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq,)
		@@ -1553,7 +1557,11 @@ $(hide) if [ -s $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq ] ; the
		-extdirs "" -d $(PRIVATE_CLASS_INTERMEDIATES_DIR) \
		$(PRIVATE_JAVACFLAGS) \
		\@$(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq \
		\|\| ( exit 41 ) \
		2>$(PRIVATE_CLASS_INTERMEDIATES_DIR)/stderr \
		&& rm -f $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stderr \
		\|\| ( if [ -f $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stderr ]; then \
		echo -e ${CL_RED}"`cat $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stderr`"${CL_RST} 1>&2; \
		fi; exit 41 ) \
		fi
		$(hide) rm -f $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list
		$(hide) rm -f $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq
		@@ -1866,8 +1874,9 @@ endif
		###########################################################
		## Commands to call Proguard
		###########################################################
		@echo -e ${CL_CYN}"Copying:"${CL_RST}" $@"
		@echo -e ${CL_GRN}"Proguard:"${CL_RST}" $@"
		define transform-jar-to-proguard
		@echo Proguard: $@
		$(hide) $(PROGUARD) -injars $< -outjars $@ $(PRIVATE_PROGUARD_FLAGS)
		endef

core/pathmap.mk

+3 −3

Original line number	Diff line number	Diff line
		@@ -53,10 +53,10 @@ pathmap_INCL := \
		wilhelm-ut:frameworks/wilhelm/src/ut \
		speex:external/speex/include

		ifneq ($(WITH_SIMPLE_RECOVERY),true)
		pathmap_INCL += recovery:bootable/recovery
		ifneq ($(RECOVERY_VARIANT),)
		pathmap_INCL += recovery:bootable/recovery-$(RECOVERY_VARIANT)
		else
		pathmap_INCL += recovery:bootable/simplerecovery
		pathmap_INCL += recovery:bootable/recovery
		endif

		#

target/product/generic_no_telephony.mk

+1 −6

Original line number	Diff line number	Diff line
		@@ -59,12 +59,7 @@ PRODUCT_PACKAGES += \
		wpa_supplicant

		PRODUCT_PACKAGES += \
		librs_jni \
		libvideoeditor_jni \
		libvideoeditor_core \
		libvideoeditor_osal \
		libvideoeditor_videofilters \
		libvideoeditorplayer \
		librs_jni

		PRODUCT_PACKAGES += \
		audio.primary.default \

tools/getb64key.py

0 → 100755

+17 −0

Original line number	Diff line number	Diff line
		#!/usr/bin/python

		import base64
		import sys
		import os

		pkFile = open(sys.argv[1], 'rb').readlines()
		base64Key = ""
		inCert = False
		for line in pkFile:
		if line.startswith("-"):
		inCert = not inCert
		continue

		base64Key += line.strip()

		print base64.b16encode(base64.b64decode(base64Key)).lower()