Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d5b351d authored by Brint E. Kriebel's avatar Brint E. Kriebel
Browse files

Merge remote-tracking branch 'github/cm-11.0' into HEAD

parents 8ab0ed0c 3bb6b8b4

core/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -1453,6 +1453,7 @@ endif 
$(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS)

$(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS)

	@echo "$(OTA_FROM_TARGET_SCRIPT)" > $(PRODUCT_OUT)/ota_script_path

	@echo "$(OTA_FROM_TARGET_SCRIPT)" > $(PRODUCT_OUT)/ota_script_path

	@echo "$(override_device)" > $(PRODUCT_OUT)/ota_override_device

	@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}" $@"

	@echo -e ${CL_YLW}"Package OTA:"${CL_RST}" $@"

	MKBOOTIMG=$(BOARD_CUSTOM_BOOTIMG_MK) \

	MKBOOTIMG=$(BOARD_CUSTOM_BOOTIMG_MK) \

	$(OTA_FROM_TARGET_SCRIPT) -v \

	$(OTA_FROM_TARGET_SCRIPT) -v \

core/checktree

+1 −1
Original line number Original line Diff line number Diff line 
#!/usr/bin/python -E

#!/usr/bin/env python -E





import sys, os, re

import sys, os, re

core/combo/select.mk

+3 −1
Original line number Original line Diff line number Diff line
@@ -75,7 +75,9 @@ ifneq ($(USE_CCACHE),) 
  # We don't really use system headers much so the rootdir is

  # We don't really use system headers much so the rootdir is

  # fine; ensures these paths are relative for all Android trees

  # fine; ensures these paths are relative for all Android trees

  # on a workstation.

  # on a workstation.

  export CCACHE_BASEDIR := /

  ifeq ($(CCACHE_BASEDIR),)

    export CCACHE_BASEDIR := $(ANDROID_BUILD_TOP)

  endif





  CCACHE_HOST_TAG := $(HOST_PREBUILT_TAG)

  CCACHE_HOST_TAG := $(HOST_PREBUILT_TAG)

  # If we are cross-compiling Windows binaries on Linux

  # If we are cross-compiling Windows binaries on Linux

core/main.mk

+6 −3
Original line number Original line Diff line number Diff line
@@ -101,9 +101,15 @@ include $(BUILD_SYSTEM)/config.mk 
# be generated correctly

# be generated correctly

include $(BUILD_SYSTEM)/cleanbuild.mk

include $(BUILD_SYSTEM)/cleanbuild.mk





# Bring in Qualcomm helper macros

include $(BUILD_SYSTEM)/qcom_utils.mk



# Include the google-specific config

# Include the google-specific config

-include vendor/google/build/config.mk

-include vendor/google/build/config.mk





# Include the extra device config

-include vendor/extra/device.mk



VERSION_CHECK_SEQUENCE_NUMBER := 3

VERSION_CHECK_SEQUENCE_NUMBER := 3

-include $(OUT_DIR)/versions_checked.mk

-include $(OUT_DIR)/versions_checked.mk

ifneq ($(VERSION_CHECK_SEQUENCE_NUMBER),$(VERSIONS_CHECKED))

ifneq ($(VERSION_CHECK_SEQUENCE_NUMBER),$(VERSIONS_CHECKED))
@@ -242,9 +248,6 @@ endif 
# Bring in standard build system definitions.

# Bring in standard build system definitions.

include $(BUILD_SYSTEM)/definitions.mk

include $(BUILD_SYSTEM)/definitions.mk





# Bring in Qualcomm helper macros

include $(BUILD_SYSTEM)/qcom_utils.mk



# Bring in dex_preopt.mk

# Bring in dex_preopt.mk

include $(BUILD_SYSTEM)/dex_preopt.mk

include $(BUILD_SYSTEM)/dex_preopt.mk

tools/getb64key.py

+1 −1
Original line number Original line Diff line number Diff line 
#!/usr/bin/python

#!/usr/bin/env python





import base64

import base64

import sys

import sys