From 22ba620a6023c25cc87b46b2d711338f524c9643 Mon Sep 17 00:00:00 2001 From: Zhao Wei Liew Date: Tue, 27 Dec 2016 14:10:18 +0800 Subject: build: Rebrand to LineageOS Change-Id: Ie03583dc2a974a159fa50c6cb19cb68aa256ca77 --- core/Makefile | 2 +- core/tasks/kernel.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'core') diff --git a/core/Makefile b/core/Makefile index 3ac9b0d..f7ae05b 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1922,7 +1922,7 @@ $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS) $(if $(OEM_OTA_CONFIG), -o $(OEM_OTA_CONFIG)) \ $(BUILT_TARGET_FILES_PACKAGE) $@ -CM_TARGET_PACKAGE := $(PRODUCT_OUT)/cm-$(CM_VERSION).zip +CM_TARGET_PACKAGE := $(PRODUCT_OUT)/lineage-$(CM_VERSION).zip .PHONY: otapackage bacon otapackage: $(INTERNAL_OTA_PACKAGE_TARGET) diff --git a/core/tasks/kernel.mk b/core/tasks/kernel.mk index f5a27c0..bc70e38 100644 --- a/core/tasks/kernel.mk +++ b/core/tasks/kernel.mk @@ -1,4 +1,5 @@ # Copyright (C) 2012 The CyanogenMod Project +# (C) 2017 The LineageOS Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -162,7 +163,7 @@ ifeq "$(wildcard $(KERNEL_SRC) )" "" $(warning * THIS IS DEPRECATED, AND WILL BE DISCONTINUED *) $(warning * Please configure your device to download the kernel *) $(warning * source repository to $(KERNEL_SRC)) - $(warning * See http://wiki.cyanogenmod.org/w/Doc:_integrated_kernel_building) + $(warning * See http://wiki.lineageos.org/w/Doc:_integrated_kernel_building) $(warning * for more information *) $(warning ***************************************************************) FULL_KERNEL_BUILD := false -- cgit v1.1 From dde61aa633c9faf147633ff129db7b5558221ad6 Mon Sep 17 00:00:00 2001 From: Brandon McAnsh Date: Thu, 29 Dec 2016 00:17:34 -0500 Subject: build: dumpvar: Display version as LINEAGE_VERSION Change-Id: Iebdb9bb97787901096d629b469a9dca6bb50528d Signed-off-by: Brandon McAnsh --- core/dumpvar.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core') diff --git a/core/dumpvar.mk b/core/dumpvar.mk index 47ba476..b25698a 100644 --- a/core/dumpvar.mk +++ b/core/dumpvar.mk @@ -67,7 +67,7 @@ HOST_OS_EXTRA:=$(shell python -c "import platform; print(platform.platform())") $(info ============================================) $(info PLATFORM_VERSION_CODENAME=$(PLATFORM_VERSION_CODENAME)) $(info PLATFORM_VERSION=$(PLATFORM_VERSION)) -$(info CM_VERSION=$(CM_VERSION)) +$(info LINEAGE_VERSION=$(CM_VERSION)) $(info TARGET_PRODUCT=$(TARGET_PRODUCT)) $(info TARGET_BUILD_VARIANT=$(TARGET_BUILD_VARIANT)) $(info TARGET_BUILD_TYPE=$(TARGET_BUILD_TYPE)) -- cgit v1.1 From a0300d400ace78f8045f17c24db33ce6d38dc072 Mon Sep 17 00:00:00 2001 From: Zhao Wei Liew Date: Mon, 2 Jan 2017 12:02:21 +0800 Subject: build: Rebrand CM_VERSION to LINEAGE_VERSION Change-Id: I8b44007ebbe395df3c989be37a5d45339f111130 --- core/Makefile | 2 +- core/dumpvar.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'core') diff --git a/core/Makefile b/core/Makefile index f7ae05b..eb9d5fd 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1922,7 +1922,7 @@ $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS) $(if $(OEM_OTA_CONFIG), -o $(OEM_OTA_CONFIG)) \ $(BUILT_TARGET_FILES_PACKAGE) $@ -CM_TARGET_PACKAGE := $(PRODUCT_OUT)/lineage-$(CM_VERSION).zip +CM_TARGET_PACKAGE := $(PRODUCT_OUT)/lineage-$(LINEAGE_VERSION).zip .PHONY: otapackage bacon otapackage: $(INTERNAL_OTA_PACKAGE_TARGET) diff --git a/core/dumpvar.mk b/core/dumpvar.mk index b25698a..0166e96 100644 --- a/core/dumpvar.mk +++ b/core/dumpvar.mk @@ -67,7 +67,7 @@ HOST_OS_EXTRA:=$(shell python -c "import platform; print(platform.platform())") $(info ============================================) $(info PLATFORM_VERSION_CODENAME=$(PLATFORM_VERSION_CODENAME)) $(info PLATFORM_VERSION=$(PLATFORM_VERSION)) -$(info LINEAGE_VERSION=$(CM_VERSION)) +$(info LINEAGE_VERSION=$(LINEAGE_VERSION)) $(info TARGET_PRODUCT=$(TARGET_PRODUCT)) $(info TARGET_BUILD_VARIANT=$(TARGET_BUILD_VARIANT)) $(info TARGET_BUILD_TYPE=$(TARGET_BUILD_TYPE)) -- cgit v1.1 From 750b0283defab06bab2edf405e1f9e0c8a35166e Mon Sep 17 00:00:00 2001 From: Ethan Chen Date: Sat, 12 Nov 2016 12:47:31 -0800 Subject: qcom_target: Remove unused support for CAF manifests * This code was introduced to support building from Qualcomm hardware manifests, placing the appropriate Qualcomm HALs at the AOSP hardware/qcom/$(HAL_TYPE) location. This isn't a supported use case anymore, so remove the dead code. Change-Id: Id7d53b33f53289bc1ead8eb983d7e252940b0387 --- core/qcom_target.mk | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'core') diff --git a/core/qcom_target.mk b/core/qcom_target.mk index 9b8d6bb..9ce451b 100644 --- a/core/qcom_target.mk +++ b/core/qcom_target.mk @@ -75,21 +75,6 @@ ifeq ($(BOARD_USES_QCOM_HARDWARE),true) endif endif -# HACK: check to see if build uses standard QC HAL paths by checking for CM path structure -AOSP_VARIANT_MAKEFILE := $(wildcard hardware/qcom/audio/default/Android.mk) -ifeq ("$(AOSP_VARIANT_MAKEFILE)","") -$(call project-set-path,qcom-audio,hardware/qcom/audio) -$(call project-set-path,qcom-display,hardware/qcom/display) -$(call project-set-path,qcom-media,hardware/qcom/media) -$(call set-device-specific-path,CAMERA,camera,hardware/qcom/camera) -$(call set-device-specific-path,GPS,gps,hardware/qcom/gps) -$(call set-device-specific-path,SENSORS,sensors,hardware/qcom/sensors) -$(call set-device-specific-path,LOC_API,loc-api,vendor/qcom/opensource/location) -$(call set-device-specific-path,DATASERVICES,dataservices,vendor/qcom/opensource/dataservices) -$(call project-set-path,ril,hardware/ril) -$(call project-set-path,wlan,hardware/qcom/wlan) -$(call project-set-path,bt-vendor,hardware/qcom/bt) -else $(call project-set-path,qcom-audio,hardware/qcom/audio-caf/$(QCOM_HARDWARE_VARIANT)) $(call project-set-path,qcom-display,hardware/qcom/display-caf/$(QCOM_HARDWARE_VARIANT)) $(call project-set-path,qcom-media,hardware/qcom/media-caf/$(QCOM_HARDWARE_VARIANT)) @@ -103,7 +88,6 @@ $(call set-device-specific-path,DATASERVICES,dataservices,vendor/qcom/opensource $(call ril-set-path-variant,ril) $(call wlan-set-path-variant,wlan-caf) $(call bt-vendor-set-path-variant,bt-caf) -endif # AOSP_VARIANT_MAKEFILE else -- cgit v1.1 From 6be9bd73c705f9762831f5149f5273293dabc7ae Mon Sep 17 00:00:00 2001 From: Luca Stefani Date: Sun, 27 Nov 2016 11:36:25 +0100 Subject: Revert "Add PRODUCT_BOOTANIMATION" Replace this with TARGET_BOOTANIMATION as part of the rework of the boot animation generation process in vendor/cm change Iee32f18440ff955d13ed85b273e97cbd540721fc. This reverts commit b2483ae08c00c42bd97f3b9e2ba5e841ec243d62. Change-Id: Id6fc55ee1bc0149f25e6165a3e5f3209ad4424fc (cherry picked from commit 74b511974651cbbcffd6e472777d33b4bf9ae5bc) --- core/product.mk | 1 - core/product_config.mk | 6 ------ 2 files changed, 7 deletions(-) (limited to 'core') diff --git a/core/product.mk b/core/product.mk index cced554..24af0f2 100644 --- a/core/product.mk +++ b/core/product.mk @@ -65,7 +65,6 @@ endef # _product_var_list := \ - PRODUCT_BOOTANIMATION \ PRODUCT_BUILD_PROP_OVERRIDES \ PRODUCT_NAME \ PRODUCT_MODEL \ diff --git a/core/product_config.mk b/core/product_config.mk index 259d983..89c6810 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -343,12 +343,6 @@ endif # The optional : is used to indicate the owner of a vendor file. PRODUCT_COPY_FILES := \ $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_COPY_FILES)) -_boot_animation := $(strip $(lastword $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_BOOTANIMATION))) -ifneq ($(_boot_animation),) -PRODUCT_COPY_FILES += \ - $(_boot_animation):system/media/bootanimation.zip -endif -_boot_animation := # We might want to skip items listed in PRODUCT_COPY_FILES for # various reasons. This is useful for replacing a binary module with one -- cgit v1.1 From bafbd7acc3c3ec1cf594223dbf09c73b2c88d6bf Mon Sep 17 00:00:00 2001 From: Zhao Wei Liew Date: Sat, 7 Jan 2017 12:36:19 +0800 Subject: build: qcom_target: Clean up QCOM_HARDWARE_VARIANT checks Change-Id: I97f812412f94a0638e78eaf7e45112b6924120a9 --- core/qcom_target.mk | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) (limited to 'core') diff --git a/core/qcom_target.mk b/core/qcom_target.mk index 9ce451b..d5631ab 100644 --- a/core/qcom_target.mk +++ b/core/qcom_target.mk @@ -22,6 +22,10 @@ $(call project-set-path,qcom-$(2),$(strip $(path))) endef ifeq ($(BOARD_USES_QCOM_HARDWARE),true) + B_FAMILY := msm8226 msm8610 msm8974 + B64_FAMILY := msm8992 msm8994 + BR_FAMILY := msm8909 msm8916 + UM_FAMILY := msm8937 msm8953 qcom_flags := -DQCOM_HARDWARE qcom_flags += -DQCOM_BSP @@ -55,24 +59,22 @@ ifeq ($(BOARD_USES_QCOM_HARDWARE),true) 2ND_CLANG_TARGET_GLOBAL_CFLAGS += $(qcom_flags) 2ND_CLANG_TARGET_GLOBAL_CPPFLAGS += $(qcom_flags) - ifeq ($(QCOM_HARDWARE_VARIANT),) - ifneq ($(filter msm8610 msm8226 msm8974,$(TARGET_BOARD_PLATFORM)),) - QCOM_HARDWARE_VARIANT := msm8974 - else - ifneq ($(filter msm8909 msm8916,$(TARGET_BOARD_PLATFORM)),) - QCOM_HARDWARE_VARIANT := msm8916 - else - ifneq ($(filter msm8953 msm8937,$(TARGET_BOARD_PLATFORM)),) - QCOM_HARDWARE_VARIANT := msm8937 - else - ifneq ($(filter msm8992 msm8994,$(TARGET_BOARD_PLATFORM)),) - QCOM_HARDWARE_VARIANT := msm8994 - else - QCOM_HARDWARE_VARIANT := $(TARGET_BOARD_PLATFORM) - endif - endif - endif - endif + ifeq ($(call is-board-platform-in-list, $(B_FAMILY)),true) + QCOM_HARDWARE_VARIANT := msm8974 + else + ifeq ($(call is-board-platform-in-list, $(B64_FAMILY)),true) + QCOM_HARDWARE_VARIANT := msm8994 + else + ifeq ($(call is-board-platform-in-list, $(BR_FAMILY)),true) + QCOM_HARDWARE_VARIANT := msm8916 + else + ifeq ($(call is-board-platform-in-list, $(UM_FAMILY)),true) + QCOM_HARDWARE_VARIANT := msm8937 + else + QCOM_HARDWARE_VARIANT := $(TARGET_BOARD_PLATFORM) + endif + endif + endif endif $(call project-set-path,qcom-audio,hardware/qcom/audio-caf/$(QCOM_HARDWARE_VARIANT)) -- cgit v1.1 From f4d20d15ffb0345b90682e2e821db3146a8b0fb7 Mon Sep 17 00:00:00 2001 From: Zhao Wei Liew Date: Tue, 3 Jan 2017 07:02:44 +0800 Subject: build: qcom_target: Define MSM_VIDC_TARGET_LIST Currently, in the media HAL, we're replacing the usage of this variable with a check for TARGET_BOARD_PLATFORM. Instead of having to do that every time a new branch is made, define the variable in qcom_target. Change-Id: Idd85b6f0b167bbc64833eb03335abcaa7b9de4a9 --- core/qcom_target.mk | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'core') diff --git a/core/qcom_target.mk b/core/qcom_target.mk index d5631ab..a8ff03a 100644 --- a/core/qcom_target.mk +++ b/core/qcom_target.mk @@ -60,17 +60,22 @@ ifeq ($(BOARD_USES_QCOM_HARDWARE),true) 2ND_CLANG_TARGET_GLOBAL_CPPFLAGS += $(qcom_flags) ifeq ($(call is-board-platform-in-list, $(B_FAMILY)),true) + MSM_VIDC_TARGET_LIST := $(B_FAMILY) QCOM_HARDWARE_VARIANT := msm8974 else ifeq ($(call is-board-platform-in-list, $(B64_FAMILY)),true) + MSM_VIDC_TARGET_LIST := $(B64_FAMILY) QCOM_HARDWARE_VARIANT := msm8994 else ifeq ($(call is-board-platform-in-list, $(BR_FAMILY)),true) + MSM_VIDC_TARGET_LIST := $(BR_FAMILY) QCOM_HARDWARE_VARIANT := msm8916 else ifeq ($(call is-board-platform-in-list, $(UM_FAMILY)),true) + MSM_VIDC_TARGET_LIST := $(UM_FAMILY) QCOM_HARDWARE_VARIANT := msm8937 else + MSM_VIDC_TARGET_LIST := $(TARGET_BOARD_PLATFORM) QCOM_HARDWARE_VARIANT := $(TARGET_BOARD_PLATFORM) endif endif -- cgit v1.1 From bb05c8fc87643e7594b53b0fc6a3217745a2b0a3 Mon Sep 17 00:00:00 2001 From: Dan Pasanen Date: Sun, 8 Jan 2017 01:01:52 -0600 Subject: core: move platform-specific helper macros to target makefiles * These (qcom specifically) are now needed sooner than we had previously been importing them. Include them within their _target.mk makefiles. This ensures they'll be imported before their macros are needed. Change-Id: I06c6ab66446e2f0b54c245cf6c2cf665b649e0c9 --- core/main.mk | 6 ------ core/mtk_target.mk | 3 +++ core/qcom_target.mk | 3 +++ 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'core') diff --git a/core/main.mk b/core/main.mk index 6560375..b82cd6a 100644 --- a/core/main.mk +++ b/core/main.mk @@ -105,12 +105,6 @@ include $(BUILD_SYSTEM)/config.mk # be generated correctly include $(BUILD_SYSTEM)/cleanbuild.mk -# Bring in Qualcomm helper macros -include $(BUILD_SYSTEM)/qcom_utils.mk - -# Bring in Mediatek helper macros too -include $(BUILD_SYSTEM)/mtk_utils.mk - # Include the google-specific config -include vendor/google/build/config.mk diff --git a/core/mtk_target.mk b/core/mtk_target.mk index 7c3ba1f..bc03eba 100644 --- a/core/mtk_target.mk +++ b/core/mtk_target.mk @@ -1,3 +1,6 @@ +# Bring in Mediatek helper macros +include $(BUILD_SYSTEM)/mtk_utils.mk + ifeq ($(BOARD_USES_MTK_HARDWARE),true) mtk_flags := -DMTK_HARDWARE diff --git a/core/qcom_target.mk b/core/qcom_target.mk index a8ff03a..40b1775 100644 --- a/core/qcom_target.mk +++ b/core/qcom_target.mk @@ -1,5 +1,8 @@ # Target-specific configuration +# Bring in Qualcomm helper macros +include $(BUILD_SYSTEM)/qcom_utils.mk + # Populate the qcom hardware variants in the project pathmap. define ril-set-path-variant $(call project-set-path-variant,ril,TARGET_RIL_VARIANT,hardware/$(1)) -- cgit v1.1 From 8cd2bcba15c328c124b28fc12cd1b9846633d5d5 Mon Sep 17 00:00:00 2001 From: Simon Shields Date: Wed, 28 Dec 2016 11:33:29 +1100 Subject: build: support lineage device trees Change-Id: I087a97e31cab2ccfba16b5378cef429785baf7d0 --- core/product_config.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'core') diff --git a/core/product_config.mk b/core/product_config.mk index 89c6810..58b03e9 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -181,7 +181,11 @@ include $(BUILD_SYSTEM)/device.mk # A CM build needs only the CM product makefiles. ifneq ($(CM_BUILD),) - all_product_configs := $(shell find device -path "*/$(CM_BUILD)/cm.mk") + all_product_configs := $(shell find device -path "*/$(CM_BUILD)/lineage.mk") + ifeq ($(all_product_configs),) + # Fall back to cm.mk + all_product_configs := $(shell find device -path "*/$(CM_BUILD)/cm.mk") + endif else ifneq ($(strip $(TARGET_BUILD_APPS)),) # An unbundled app build needs only the core product makefiles. -- cgit v1.1 From a3b37940bdcdc04e786fcca54195f957aa83d72b Mon Sep 17 00:00:00 2001 From: Zhao Wei Liew Date: Fri, 13 Jan 2017 08:21:29 +0800 Subject: build: kernel: Remove obsolete checks * BOARD_USES_UBOOT is unused. * Same goes for BOARD_USES_UNCOMPRESSED_BOOT. Furthermore, it is superseded by TARGET_USES_UNCOMPRESSED_KERNEL. Change-Id: I9f0e2848fcd0cd212bccacf14df55ad03f821051 --- core/tasks/kernel.mk | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'core') diff --git a/core/tasks/kernel.mk b/core/tasks/kernel.mk index bc70e38..de51b74 100644 --- a/core/tasks/kernel.mk +++ b/core/tasks/kernel.mk @@ -135,16 +135,6 @@ else KERNEL_ADDITIONAL_CONFIG_SRC := /dev/null endif -## Do be discontinued in a future version. Notify builder about target -## kernel format requirement -ifeq ($(BOARD_KERNEL_IMAGE_NAME),) -ifeq ($(BOARD_USES_UBOOT),true) - $(error "Please set BOARD_KERNEL_IMAGE_NAME to uImage") -else ifeq ($(BOARD_USES_UNCOMPRESSED_BOOT),true) - $(error "Please set BOARD_KERNEL_IMAGE_NAME to Image") -endif -endif - ifeq "$(wildcard $(KERNEL_SRC) )" "" ifneq ($(TARGET_PREBUILT_KERNEL),) HAS_PREBUILT_KERNEL := true -- cgit v1.1 From 24d91d8dd36b1b2a681461bea56a44605521861e Mon Sep 17 00:00:00 2001 From: Gabriele M Date: Tue, 10 Jan 2017 23:14:12 +0100 Subject: ota_from_target_files: Remove device dependent arguments These device-specific arguments are defined at build time and are necessary to generate the zip correctly. Don't use command line arguments to specify them, but write all the needed information in misc_info.txt when the target-files zip is generated. ota_from_target_files will then read misc_info.txt and set everything automatically. Change-Id: Ibdbca575b76eb07b53fccfcea52a351c7e333f91 --- core/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'core') diff --git a/core/Makefile b/core/Makefile index eb9d5fd..aff7821 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1838,6 +1838,8 @@ ifdef PRODUCT_DEFAULT_DEV_CERTIFICATE else $(hide) build/tools/getb64key.py $(DEFAULT_SYSTEM_DEV_CERTIFICATE).x509.pem > $(zip_root)/META/releasekey.txt endif + $(hide) echo "ota_override_device=$(OTA_SCRIPT_OVERRIDE_DEVICE)" >> $(zip_root)/META/misc_info.txt + $(hide) echo "ota_override_prop=$(OTA_SCRIPT_OVERRIDE_PROP)" >> $(zip_root)/META/misc_info.txt @# Zip everything up, preserving symlinks $(hide) (cd $(zip_root) && zip -qry ../$(notdir $@) .) @# Run fs_config on all the system, vendor, boot ramdisk, @@ -1892,15 +1894,15 @@ endif endif ifeq ($(TARGET_OTA_ASSERT_DEVICE),) - $(INTERNAL_OTA_PACKAGE_TARGET): override_device := auto + OTA_SCRIPT_OVERRIDE_DEVICE := auto else - $(INTERNAL_OTA_PACKAGE_TARGET): override_device := $(TARGET_OTA_ASSERT_DEVICE) + OTA_SCRIPT_OVERRIDE_DEVICE := $(TARGET_OTA_ASSERT_DEVICE) endif ifneq ($(TARGET_UNIFIED_DEVICE),) - $(INTERNAL_OTA_PACKAGE_TARGET): override_prop := --override_prop=true + OTA_SCRIPT_OVERRIDE_PROP := true ifeq ($(TARGET_OTA_ASSERT_DEVICE),) - $(INTERNAL_OTA_PACKAGE_TARGET): override_device := $(TARGET_DEVICE) + OTA_SCRIPT_OVERRIDE_DEVICE := $(TARGET_OTA_ASSERT_DEVICE) endif endif @@ -1910,7 +1912,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 -e ${CL_YLW}"Package OTA:"${CL_RST}" $@" $(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH MKBOOTIMG=$(MKBOOTIMG) \ $(OTA_FROM_TARGET_SCRIPT) -v \ @@ -1918,7 +1919,6 @@ $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS) -p $(HOST_OUT) \ -k $(KEY_CERT_PAIR) \ --backup=$(backuptool) \ - --override_device=$(override_device) $(override_prop) \ $(if $(OEM_OTA_CONFIG), -o $(OEM_OTA_CONFIG)) \ $(BUILT_TARGET_FILES_PACKAGE) $@ -- cgit v1.1 From a9182851fe1b9c992809f42caced4dd7f29026dc Mon Sep 17 00:00:00 2001 From: Tom Powell Date: Sun, 22 Jan 2017 12:32:53 -0800 Subject: core: include libf2fs_fmt_host_dyn in otatools Change-Id: I4f31352139b2f38570f0370afff3901999082e48 --- core/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'core') diff --git a/core/Makefile b/core/Makefile index aff7821..05169b0 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1557,7 +1557,8 @@ DISTTOOLS += \ $(HOST_LIBRARY_PATH)/libext2_e2p_host$(HOST_SHLIB_SUFFIX) \ $(HOST_LIBRARY_PATH)/libext2_profile_host$(HOST_SHLIB_SUFFIX) \ $(HOST_LIBRARY_PATH)/libext2_quota_host$(HOST_SHLIB_SUFFIX) \ - $(HOST_LIBRARY_PATH)/libext2_uuid_host$(HOST_SHLIB_SUFFIX) + $(HOST_LIBRARY_PATH)/libext2_uuid_host$(HOST_SHLIB_SUFFIX) \ + $(HOST_LIBRARY_PATH)/libf2fs_fmt_host_dyn$(HOST_SHLIB_SUFFIX) OTATOOLS := $(DISTTOOLS) \ $(HOST_OUT_EXECUTABLES)/aapt -- cgit v1.1 From 9347d9680eca73a55d83fea3c9320e91aa92605a Mon Sep 17 00:00:00 2001 From: Gabriele M Date: Sun, 22 Jan 2017 20:51:01 +0100 Subject: core: Fix unified trees with no TARGET_OTA_ASSERT_DEVICE If TARGET_OTA_ASSERT_DEVICE is not set, TARGET_DEVICE should be used for OTA_SCRIPT_OVERRIDE_DEVICE. Change-Id: If382dfa29dddb39498dec5f5eadc9895b7c47d88 --- core/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core') diff --git a/core/Makefile b/core/Makefile index 05169b0..6cf4b9e 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1903,7 +1903,7 @@ endif ifneq ($(TARGET_UNIFIED_DEVICE),) OTA_SCRIPT_OVERRIDE_PROP := true ifeq ($(TARGET_OTA_ASSERT_DEVICE),) - OTA_SCRIPT_OVERRIDE_DEVICE := $(TARGET_OTA_ASSERT_DEVICE) + OTA_SCRIPT_OVERRIDE_DEVICE := $(TARGET_DEVICE) endif endif -- cgit v1.1 From b954ff5caa5cc8fb7ebd643124e457f073a8291d Mon Sep 17 00:00:00 2001 From: mh0rst Date: Sun, 29 Jan 2017 14:35:26 +0100 Subject: Update security patch level to 2017-01-01. Change-Id: I21cea7dab2ab3236521a171ffa63dae6bb12cccd --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core') diff --git a/core/version_defaults.mk b/core/version_defaults.mk index e30ea21..65bbf74 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -105,7 +105,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" # It must match one of the Android Security Patch Level strings of the Public Security Bulletins. # # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2016-12-01 + PLATFORM_SECURITY_PATCH := 2017-01-01 endif ifeq "" "$(PLATFORM_BASE_OS)" -- cgit v1.1 From a14bcf5d0037a3d18d8b807b8999aca2cf524d56 Mon Sep 17 00:00:00 2001 From: Tom Powell Date: Fri, 3 Feb 2017 16:06:10 -0800 Subject: Include make_f2fs/mkf2fsuserimg in otatools Change-Id: I1657ae2ca79214eab70e8976f6f59e6b5433afcd --- core/Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'core') diff --git a/core/Makefile b/core/Makefile index 6cf4b9e..e14ff88 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1535,7 +1535,9 @@ DISTTOOLS := $(HOST_OUT_EXECUTABLES)/minigzip \ $(HOST_OUT_JAVA_LIBRARIES)/signapk.jar \ $(HOST_OUT_JAVA_LIBRARIES)/BootSignature.jar \ $(HOST_OUT_EXECUTABLES)/mkuserimg.sh \ + $(HOST_OUT_EXECUTABLES)/mkf2fsuserimg.sh \ $(HOST_OUT_EXECUTABLES)/make_ext4fs \ + $(HOST_OUT_EXECUTABLES)/make_f2fs \ $(HOST_OUT_EXECUTABLES)/simg2img \ $(HOST_OUT_EXECUTABLES)/e2fsck \ $(HOST_OUT_EXECUTABLES)/build_verity_tree \ -- cgit v1.1 From eee8d5e431f113c145fe8a7b34c3b797d7c5f1d5 Mon Sep 17 00:00:00 2001 From: Abhisek Devkota Date: Wed, 8 Feb 2017 12:12:13 -0800 Subject: Add dumpvar for WITH_SU -Allow folks to see easily if the term session they are in has WITH_SU set to true -Also add a dumpvar rule for WITH_GMS for those that have it -Remove unused CYNGN dumpvar rules Change-Id: I8cba8ffecd8f8943c69326ae07bcc17ea61e3f34 --- core/dumpvar.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'core') diff --git a/core/dumpvar.mk b/core/dumpvar.mk index 0166e96..563683f 100644 --- a/core/dumpvar.mk +++ b/core/dumpvar.mk @@ -84,9 +84,11 @@ $(info HOST_OS_EXTRA=$(HOST_OS_EXTRA)) $(info HOST_BUILD_TYPE=$(HOST_BUILD_TYPE)) $(info BUILD_ID=$(BUILD_ID)) $(info OUT_DIR=$(OUT_DIR)) -ifeq ($(CYNGN_TARGET),true) -$(info CYNGN_TARGET=$(CYNGN_TARGET)) -$(info CYNGN_FEATURES=$(CYNGN_FEATURES)) +ifeq ($(WITH_SU),true) +$(info WITH_SU=$(WITH_SU)) +endif +ifeq ($(WITH_GMS),true) +$(info WITH_GMS=$(WITH_GMS)) endif $(info ============================================) endif -- cgit v1.1 From 25e01a691f9a43387cad574a3d2d64c74a390e4e Mon Sep 17 00:00:00 2001 From: Paul Keith Date: Wed, 8 Feb 2017 16:25:09 -0600 Subject: dumpvar: Dump RECOVERY_VARIANT if not empty * As more and more people are building twrp, let's remind them what they are doing Change-Id: I60b9d708f9192b9014d94c248fab8385b95951cf Signed-off-by: Paul Keith --- core/dumpvar.mk | 3 +++ 1 file changed, 3 insertions(+) (limited to 'core') diff --git a/core/dumpvar.mk b/core/dumpvar.mk index 563683f..6bdcc5d 100644 --- a/core/dumpvar.mk +++ b/core/dumpvar.mk @@ -84,6 +84,9 @@ $(info HOST_OS_EXTRA=$(HOST_OS_EXTRA)) $(info HOST_BUILD_TYPE=$(HOST_BUILD_TYPE)) $(info BUILD_ID=$(BUILD_ID)) $(info OUT_DIR=$(OUT_DIR)) +ifneq ($(RECOVERY_VARIANT),) +$(info RECOVERY_VARIANT=$(RECOVERY_VARIANT) +endif ifeq ($(WITH_SU),true) $(info WITH_SU=$(WITH_SU)) endif -- cgit v1.1 From fafb7e2a14706f75bd76aca21c1c7d695f938ed3 Mon Sep 17 00:00:00 2001 From: "Kevin F. Haggerty" Date: Wed, 8 Feb 2017 22:56:15 -0700 Subject: dumpvar: Close yo' parens on RECOVERY_VARIANT Change-Id: Iedca93d7990fd8cd67e2086fe5bc151964d1059f --- core/dumpvar.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core') diff --git a/core/dumpvar.mk b/core/dumpvar.mk index 6bdcc5d..f60e455 100644 --- a/core/dumpvar.mk +++ b/core/dumpvar.mk @@ -85,7 +85,7 @@ $(info HOST_BUILD_TYPE=$(HOST_BUILD_TYPE)) $(info BUILD_ID=$(BUILD_ID)) $(info OUT_DIR=$(OUT_DIR)) ifneq ($(RECOVERY_VARIANT),) -$(info RECOVERY_VARIANT=$(RECOVERY_VARIANT) +$(info RECOVERY_VARIANT=$(RECOVERY_VARIANT)) endif ifeq ($(WITH_SU),true) $(info WITH_SU=$(WITH_SU)) -- cgit v1.1