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

Commit 99c9d0e9 authored by Koushik Dutta's avatar Koushik Dutta
Browse files

Merge branch 'gingerbread' of git://github.com/CyanogenMod/android_build into gingerbread

parents edcd2951 bae09ac4

core/Makefile

+7 −0
Original line number Diff line number Diff line
@@ -1061,11 +1061,18 @@ INTERNAL_OTA_PACKAGE_TARGET := $(PRODUCT_OUT)/$(name).zip 


$(INTERNAL_OTA_PACKAGE_TARGET): KEY_CERT_PAIR := $(DEFAULT_KEY_CERT_PAIR)



ifdef CYANOGEN_WITH_GOOGLE

$(INTERNAL_OTA_PACKAGE_TARGET): backuptool := false

else

$(INTERNAL_OTA_PACKAGE_TARGET): backuptool := true

endif



$(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(OTATOOLS)

	@echo "Package OTA: $@"

	$(hide) ./build/tools/releasetools/ota_from_target_files -v \

	   -p $(HOST_OUT) \

           -k $(KEY_CERT_PAIR) \

           --backup=$(backuptool) \

           $(BUILT_TARGET_FILES_PACKAGE) $@



.PHONY: otapackage

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

+32 −5
Original line number Diff line number Diff line
@@ -8,15 +8,42 @@ ARCH_ARM_HAVE_HALFWORD_MULTIPLY := true 
ARCH_ARM_HAVE_CLZ               := true

ARCH_ARM_HAVE_FFS               := true

ARCH_ARM_HAVE_ARMV7A            := true

ifneq ($(strip $(TARGET_ARCH_VARIANT_FPU)),none)

ARCH_ARM_HAVE_VFP               := true

else

ARCH_ARM_HAVE_VFP               := false

endif



ifeq ($(strip $(TARGET_ARCH_VARIANT_FPU)),)

TARGET_ARCH_VARIANT_FPU         := neon

endif



ifeq ($(strip $(TARGET_ARCH_VARIANT_FPU)),neon)

ARCH_ARM_HAVE_NEON              := true

endif



ifeq ($(strip $(TARGET_ARCH_VARIANT_CPU)),)

TARGET_ARCH_VARIANT_CPU         := cortex-a8

endif



ifeq ($(strip $(TARGET_CPU_SMP)),true)

ARCH_ARM_HAVE_TLS_REGISTER      := true

endif



# Note: Hard coding the 'tune' value here is probably not ideal,

# and a better solution should be found in the future.

#

arch_variant_cflags := \

    -march=armv7-a \

    -mfloat-abi=softfp \

    -mfpu=vfpv3-d16

    -mtune=$(TARGET_ARCH_VARIANT_CPU)



ifeq ($(strip $(ARCH_ARM_HAVE_VFP)),true)

arch_variant_cflags += -mfloat-abi=softfp

arch_variant_cflags += -mfpu=$(TARGET_ARCH_VARIANT_FPU)

else

arch_variant_cflags += -mfloat-abi=soft

endif



ifeq ($(strip $(TARGET_ARCH_VARIANT_CPU)),cortex-a8)

arch_variant_ldflags := \

	-Wl,--fix-cortex-a8

else

arch_variant_ldflags :=

endif

core/main.mk

+11 −3
Original line number Diff line number Diff line
@@ -771,12 +771,20 @@ $(call dist-for-goals,sdk, \ 
findbugs: $(INTERNAL_FINDBUGS_HTML_TARGET) $(INTERNAL_FINDBUGS_XML_TARGET)



.PHONY: clean

dirs_to_clean := \

	$(PRODUCT_OUT) \

	$(TARGET_COMMON_OUT_ROOT)

clean:

	@rm -rf $(OUT_DIR)

	@echo "Entire build directory removed."

	@for dir in $(dirs_to_clean) ; do \

	    echo "Cleaning $$dir..."; \

	    rm -rf $$dir; \

	done

	@echo "Clean."; \



.PHONY: clobber

clobber: clean

clobber:

	@rm -rf $(OUT_DIR)

	@echo "Entire build directory removed."



# The rules for dataclean and installclean are defined in cleanbuild.mk.

core/user_tags.mk

+0 −8
Original line number Diff line number Diff line
@@ -123,9 +123,7 @@ GRANDFATHERED_USER_MODULES += \ 
	fw_bcm4329.bin \

	genext2fs \

	gps.mahimahi \

	gps.vision \

	gralloc.default \

	gralloc.msm7x30 \

	gralloc.qsd8k \

	groovy-all-1.7.0 \

	grxmlcompile \
@@ -249,7 +247,6 @@ GRANDFATHERED_USER_MODULES += \ 
	libmincrypt \

	libminui \

	libminzip \

	libmm-omxcore \

	libmtdutils \

	libmusicbundle \

	libneo_cgi \
@@ -257,9 +254,6 @@ GRANDFATHERED_USER_MODULES += \ 
	libneo_util \

	libnetlink \

	libnetutils \

	libOmxCore \

	libOmxVdec \

	libOmxVenc \

	libop \

	libOpenSLES \

	libopensles_helper \
@@ -359,7 +353,6 @@ GRANDFATHERED_USER_MODULES += \ 
	libxml2 \

	libzipfile \

	lights.kraken \

	lights.msm7x30 \

	lights.qsd8k \

	line_endings \

	linker \
@@ -399,7 +392,6 @@ GRANDFATHERED_USER_MODULES += \ 
	org-netbeans-api-visual \

	org-openide-util \

	osgi \

	overlay.default \

	pand \

	parseStringTest \

	ping \

tools/releasetools/edify_generator.py

+7 −0
Original line number Diff line number Diff line
@@ -99,6 +99,11 @@ class EdifyGenerator(object): 
           ");")

    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('set_perm(0, 0, 0777, "/tmp/backuptool.sh");')

    self.script.append(('run_program("/tmp/backuptool.sh", "%s");' % command))



  def ShowProgress(self, frac, dur):

    """Update the progress bar, advancing it over 'frac' over the next

    'dur' seconds.  'dur' may be zero to advance it via SetProgress
@@ -234,12 +239,14 @@ class EdifyGenerator(object): 
    else:

      # backward compatibility with older target-files that lack recovery.fstab

      if self.info["partition_type"] == "MTD":

        partition_type, partition = common.GetTypeAndDevice(mount_point, self.info)

        self.script.append(

            ('assert(package_extract_file("%(fn)s", "/tmp/%(partition)s.img"),\n'

             '       write_raw_image("/tmp/%(partition)s.img", "%(partition)s"),\n'

             '       delete("/tmp/%(partition)s.img"));')

            % {'partition': partition, 'fn': fn})

      elif self.info["partition_type"] == "EMMC":

        partition_type, partition = common.GetTypeAndDevice(mount_point, self.info)

        self.script.append(

            ('package_extract_file("%(fn)s", "%(dir)s%(partition)s");')

            % {'partition': partition, 'fn': fn,