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

Commit 8b6ded98 authored by Brint E. Kriebel's avatar Brint E. Kriebel
Browse files

Merge branch 'cm-11.0' into stable/cm-11.0

parents e673a4e4 4e06bdf9

core/Makefile

+9 −0
Original line number Diff line number Diff line
@@ -1356,6 +1356,12 @@ endif 
	@# Contents of the data image

	$(hide) $(call package_files-copy-root, \

		$(TARGET_OUT_DATA),$(zip_root)/DATA)

ifdef BOARD_CUSTOM_BOOTIMG_MK

	@# Prebuilt boot images

	$(hide) mkdir -p $(zip_root)/BOOTABLE_IMAGES

	$(hide) $(ACP) $(INSTALLED_BOOTIMAGE_TARGET) $(zip_root)/BOOTABLE_IMAGES/

	$(hide) $(ACP) $(INSTALLED_RECOVERYIMAGE_TARGET) $(zip_root)/BOOTABLE_IMAGES/

endif

ifdef BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE

	@# Contents of the vendor image

	$(hide) $(call package_files-copy-root, \
@@ -1401,6 +1407,9 @@ endif 
ifdef TARGET_UNIFIED_DEVICE

	$(hide) echo "override_prop=true" >> $(zip_root)/META/misc_info.txt

endif

ifdef TARGET_NO_SEPARATE_RECOVERY

	$(hide) echo "no_separate_recovery=true" >> $(zip_root)/META/misc_info.txt

endif

ifdef BUILD_NO

	$(hide) echo "build_number=$(BUILD_NO)" >> $(zip_root)/META/misc_info.txt

endif

core/combo/arch/arm/armv7-a-neon.mk

+1 −5
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ ARCH_ARM_HAVE_VFP := true 
ARCH_ARM_HAVE_VFP_D32           := true

ARCH_ARM_HAVE_NEON              := true



ifeq ($(strip $(TARGET_CPU_VARIANT)), cortex-a15)

ifeq ($(TARGET_CPU_VARIANT),$(filter $(TARGET_CPU_VARIANT),cortex-a15 krait))

	arch_variant_cflags := -mcpu=cortex-a15

else

ifeq ($(strip $(TARGET_CPU_VARIANT)),cortex-a9)
@@ -21,9 +21,6 @@ else 
ifeq ($(strip $(TARGET_CPU_VARIANT)),cortex-a5)

	arch_variant_cflags := -mcpu=cortex-a5

else

ifeq ($(strip $(TARGET_CPU_VARIANT)),krait)

	arch_variant_cflags := -mcpu=cortex-a9

else

ifeq ($(strip $(TARGET_CPU_VARIANT)),scorpion)

	arch_variant_cflags := -mcpu=cortex-a8

else
@@ -34,7 +31,6 @@ endif 
endif

endif

endif

endif



arch_variant_cflags += \

    -mfloat-abi=softfp \

tools/device/BoardConfig.mk.template

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ TARGET_CPU_ABI := armeabi-v7a 
TARGET_CPU_ABI2 := armeabi

TARGET_ARCH_VARIANT := armv7-a-neon

TARGET_CPU_VARIANT := cortex-a7

TARGET_CPU_SMP := true

ARCH_ARM_HAVE_TLS_REGISTER := true



TARGET_BOOTLOADER_BOARD_NAME := __DEVICE__

tools/releasetools/common.py

+0 −7
Original line number Diff line number Diff line
@@ -350,13 +350,6 @@ def GetBootableImage(name, prebuilt_name, unpack_dir, tree_subdir, 


  prebuilt_dir = os.path.join(unpack_dir, "BOOTABLE_IMAGES")

  prebuilt_path = os.path.join(prebuilt_dir, prebuilt_name)

  custom_bootimg_mk = os.getenv('MKBOOTIMG')

  if custom_bootimg_mk:

    bootimage_path = os.path.join(os.getenv('OUT'), prebuilt_name)

    print "using custom bootimage makefile %s..." % (custom_bootimg_mk,)

    if not os.path.isdir(prebuilt_dir):

        os.mkdir(prebuilt_dir)

    shutil.copyfile(bootimage_path, prebuilt_path)

  if os.path.exists(prebuilt_path):

    print "using prebuilt %s..." % (prebuilt_name,)

    return File.FromLocalFile(name, prebuilt_path)

tools/releasetools/edify_generator.py

+8 −0
Original line number Diff line number Diff line
@@ -108,6 +108,14 @@ class EdifyGenerator(object): 
           ");")

    self.script.append(self._WordWrap(cmd))



  def AssertSomeBaseband(self, *basebands):

    """Assert that the baseband version is one of *basebands."""

    cmd = ("assert(" +

           " ||\0".join(['getprop("ro.baseband") == "%s"' % (b,)

                         for b in basebands]) +

           ");")

    self.script.append(self._WordWrap(cmd))



  def RunBackup(self, command):

    self.script.append('package_extract_file("system/bin/backuptool.sh", "/tmp/backuptool.sh");')

    self.script.append('package_extract_file("system/bin/backuptool.functions", "/tmp/backuptool.functions");')