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

Commit 874d6c66 authored by Koushik Dutta's avatar Koushik Dutta
Browse files

Merge branch 'eclair' of git://github.com/cyanogen/android_build into eclair

parents fbc4e5c3 016d6898

core/Makefile

+8 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ $(INSTALLED_BUILD_PROP_TARGET): $(BUILDINFO_SH) $(INTERNAL_BUILD_ID_MAKEFILE) 
			TARGET_BOARD_PLATFORM="$(TARGET_BOARD_PLATFORM)" \

			TARGET_CPU_ABI="$(TARGET_CPU_ABI)" \

			TARGET_CPU_ABI2="$(TARGET_CPU_ABI2)" \

			PRODUCT_INFO_PREBUILT="$(PRODUCT_INFO_PREBUILT)" \

			$(PRODUCT_BUILD_PROP_OVERRIDES) \

	        bash $(BUILDINFO_SH) > $@

	$(hide) if [ -f $(TARGET_DEVICE_DIR)/system.prop ]; then \
@@ -965,6 +966,12 @@ else 
$(INTERNAL_OTA_PACKAGE_TARGET): backuptool := $(TARGET_OTA_BACKUPTOOL)

endif



ifeq ($(TARGET_OTA_ASSERT_DEVICE),)

$(INTERNAL_OTA_PACKAGE_TARGET): override_device := auto

else

$(INTERNAL_OTA_PACKAGE_TARGET): override_device := $(TARGET_OTA_ASSERT_DEVICE)

endif



$(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) otatools

	@echo "Package OTA: $@"

	$(hide) ./build/tools/releasetools/ota_from_target_files \
@@ -973,6 +980,7 @@ $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) otatools 
	   -p $(HOST_OUT) \

           -k $(KEY_CERT_PAIR) \

           --backup=$(backuptool) \

	   --override_device=$(override_device) \

           $(BUILT_TARGET_FILES_PACKAGE) $@



.PHONY: otapackage

core/kernel.mk

+4 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ TARGET_KERNEL_CONFIG ?= goldfish_defconfig 
endif



KBUILD_OUTPUT := $(CURDIR)/$(TARGET_OUT_INTERMEDIATES)/kernel

mk_kernel := + $(hide) $(MAKE) -C kernel O=$(KBUILD_OUTPUT) ARCH=$(TARGET_ARCH) $(if $(SHOW_COMMANDS),V=1)

mk_kernel := + $(hide) $(MAKE) -C $(TARGET_KERNEL_DIR) O=$(KBUILD_OUTPUT) ARCH=$(TARGET_ARCH) $(if $(SHOW_COMMANDS),V=1)

ifneq ($(TARGET_ARCH),$(HOST_ARCH))

mk_kernel += INSTALL_MOD_STRIP=1

mk_kernel += CROSS_COMPILE=$(CURDIR)/$(TARGET_TOOLS_PREFIX)
@@ -29,7 +29,7 @@ endif 
ifneq ($(wildcard $(TARGET_KERNEL_CONFIG)),)

KERNEL_CONFIG_FILE := $(TARGET_KERNEL_CONFIG)

else

KERNEL_CONFIG_FILE := kernel/arch/$(TARGET_ARCH)/configs/$(TARGET_KERNEL_CONFIG)

KERNEL_CONFIG_FILE := $(TARGET_KERNEL_DIR)/arch/$(TARGET_ARCH)/configs/$(TARGET_KERNEL_CONFIG)

endif

MOD_ENABLED := $(shell grep ^CONFIG_MODULES=y $(KERNEL_CONFIG_FILE))

FIRMWARE_ENABLED := $(shell grep ^CONFIG_FIRMWARE_IN_KERNEL=y $(KERNEL_CONFIG_FILE))
@@ -63,11 +63,13 @@ endif 


.PHONY: _wifi

_wifi: _modules

ifneq ($(TARGET_NO_BUILD_WIFI),true)

	@echo "**** BUILDING WIFI ****"

ifneq ($(MOD_ENABLED),)

	@echo "Copying $(shell ls $(CURDIR)/$(TARGET_OUT)/lib/modules/*/kernel/drivers/net/wireless/*/*.ko) -> $(CURDIR)/$(TARGET_OUT)/lib/modules/$(notdir $(shell ls $(CURDIR)/$(TARGET_OUT)/lib/modules/*/kernel/drivers/net/wireless/*/*.ko))"

	$(hide) cp $(shell ls $(CURDIR)/$(TARGET_OUT)/lib/modules/*/kernel/drivers/net/wireless/*/*.ko) $(CURDIR)/$(TARGET_OUT)/lib/modules/$(notdir $(shell ls $(CURDIR)/$(TARGET_OUT)/lib/modules/*/kernel/drivers/net/wireless/*/*.ko))

endif

endif



$(INSTALLED_KERNEL_TARGET): _wifi

	@echo "**** KERNEL BUILT ****"

tools/buildinfo.sh

+11 −7
Original line number Diff line number Diff line
@@ -15,11 +15,13 @@ echo "ro.build.type=$TARGET_BUILD_TYPE" 
echo "ro.build.user=$USER"

echo "ro.build.host=`hostname`"

echo "ro.build.tags=$BUILD_VERSION_TAGS"

if [ "$PRODUCT_INFO_PREBUILT" != "true" ] ; then

  echo "ro.product.model=$PRODUCT_MODEL"

  echo "ro.product.brand=$PRODUCT_BRAND"

  echo "ro.product.name=$PRODUCT_NAME"

  echo "ro.product.device=$TARGET_DEVICE"

  echo "ro.product.board=$TARGET_BOOTLOADER_BOARD_NAME"

fi

echo "ro.product.cpu.abi=$TARGET_CPU_ABI"

if [ -n "$TARGET_CPU_ABI2" ] ; then

  echo "ro.product.cpu.abi2=$TARGET_CPU_ABI2"
@@ -30,8 +32,10 @@ echo "ro.product.locale.region=$PRODUCT_DEFAULT_REGION" 
echo "ro.wifi.channels=$PRODUCT_DEFAULT_WIFI_CHANNELS"

echo "ro.board.platform=$TARGET_BOARD_PLATFORM"



if [ "$PRODUCT_INFO_PREBUILT" != "true" ] ; then

  echo "# ro.build.product is obsolete; use ro.product.device"

  echo "ro.build.product=$TARGET_DEVICE"

fi



echo "# Do not try to parse ro.build.description or .fingerprint"

echo "ro.build.description=$PRIVATE_BUILD_DESC"

tools/releasetools/edify_generator.py

+4 −2
Original line number Diff line number Diff line
@@ -86,8 +86,10 @@ class EdifyGenerator(object): 


  def AssertDevice(self, device):

    """Assert that the device identifier is the given string."""

    cmd = ('assert(getprop("ro.product.device") == "%s" ||\0'

           'getprop("ro.build.product") == "%s");' % (device, device))

    cmd = ('assert(' + 

           ' || \0'.join(['getprop("ro.product.device") == "%s" || getprop("ro.build.product") == "%s"'

                         % (i, i) for i in device.split(",")]) + 

           ');')

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



  def AssertSomeBootloader(self, *bootloaders):

tools/releasetools/ota_from_target_files

+12 −2
Original line number Diff line number Diff line
@@ -52,6 +52,9 @@ Usage: ota_from_target_files [flags] input_target_files output_ota_package 
      Enable or disable the execution of backuptool.sh.

      Disabled by default.



  --override_device <device>

      Override device-specific asserts. Can be a comma-separated list.



"""



import sys
@@ -88,6 +91,7 @@ OPTIONS.extra_script = None 
OPTIONS.script_mode = 'auto'

OPTIONS.worker_threads = 3

OPTIONS.backuptool = False

OPTIONS.override_device = 'auto'



def MostPopularKey(d, default):

  """Given a dict, return the key corresponding to the largest
@@ -286,7 +290,10 @@ def SignOutput(temp_zip_name, output_zip_name): 




def AppendAssertions(script, input_zip):

  if OPTIONS.override_device == "auto":

    device = GetBuildProp("ro.product.device", input_zip)

  else:

    device = OPTIONS.override_device

  script.AssertDevice(device)
@@ -846,6 +853,8 @@ def main(argv): 
      OPTIONS.worker_threads = int(a)

    elif o in ("--backup"):

      OPTIONS.backuptool = bool(a.lower() == 'true')

    elif o in ("--override_device"):

      OPTIONS.override_device = a

    else:

      return False

    return True
@@ -860,7 +869,8 @@ def main(argv): 
                                              "extra_script=",

                                              "script_mode=",

                                              "worker_threads=",

                                              "backup="],

                                              "backup=",

                                              "override_device="],

                             extra_option_handler=option_handler)



  if len(args) != 2: