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

Commit 6db85971 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "Update references to build/core to build/make/core"

parents 8bef6515 6cdc5d20

core/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -2644,7 +2644,7 @@ endif 
name := $(name)-symbols-$(FILE_NAME_TAG)



SYMBOLS_ZIP := $(PRODUCT_OUT)/$(name).zip

# For apps_only build we'll establish the dependency later in build/core/main.mk.

# For apps_only build we'll establish the dependency later in build/make/core/main.mk.

ifndef TARGET_BUILD_APPS

$(SYMBOLS_ZIP): $(INSTALLED_SYSTEMIMAGE) \

		$(INSTALLED_BOOTIMAGE_TARGET) \
@@ -2710,7 +2710,7 @@ ifeq (true,$(EMMA_INSTRUMENT)) 
# An archive of classes for use in generating code-coverage reports

# These are the uninstrumented versions of any classes that were

# to be instrumented.

# Any dependencies are set up later in build/core/main.mk.

# Any dependencies are set up later in build/make/core/main.mk.



JACOCO_REPORT_CLASSES_ALL := $(PRODUCT_OUT)/jacoco-report-classes-all.jar

$(JACOCO_REPORT_CLASSES_ALL) :
@@ -2732,7 +2732,7 @@ endif # EMMA_INSTRUMENT=true 
#

ifdef TARGET_BUILD_APPS

PROGUARD_DICT_ZIP := $(PRODUCT_OUT)/$(TARGET_PRODUCT)-proguard-dict-$(FILE_NAME_TAG).zip

# the dependency will be set up later in build/core/main.mk.

# the dependency will be set up later in build/make/core/main.mk.

$(PROGUARD_DICT_ZIP) :

	@echo "Packaging Proguard obfuscation dictionary files."

	$(hide) dict_files=`find $(TARGET_OUT_COMMON_INTERMEDIATES)/APPS -name proguard_dictionary`; \

core/cleanbuild.mk

+3 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ PWD := $(shell pwd) 
TOP := .

TOPDIR :=



BUILD_SYSTEM := $(TOPDIR)build/core

BUILD_SYSTEM := $(TOPDIR)build/make/core



# Set up various standard variables based on configuration

# and host information.
@@ -48,7 +48,7 @@ INTERNAL_CLEAN_STEPS := 
#

# $(1): shell command to run

# $(2): indicate to not use makefile path as part of step id if not empty.

#       $(2) should only be used in build/core/cleanspec.mk: just for compatibility.

#       $(2) should only be used in build/make/core/cleanspec.mk: just for compatibility.

define _add-clean-step

  $(if $(strip $(INTERNAL_CLEAN_BUILD_VERSION)),, \

      $(error INTERNAL_CLEAN_BUILD_VERSION not set))
@@ -67,7 +67,7 @@ define _add-clean-step 
  $(eval _acs_makefile_prefix :=)

endef

define add-clean-step

$(eval # for build/core/cleanspec.mk, dont use makefile path as part of step id) \

$(eval # for build/make/core/cleanspec.mk, dont use makefile path as part of step id) \

$(if $(filter %/cleanspec.mk,$(lastword $(MAKEFILE_LIST))),\

    $(eval $(call _add-clean-step,$(1),true)),\

    $(eval $(call _add-clean-step,$(1))))

core/combo/arch/x86/atom.mk

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# 'x86-atom' arch variant. This is an extension of the 'x86' base variant

# that adds Atom-specific features.

#

# See build/core/combo/arch/x86/x86.mk for differences.

# See build/make/core/combo/arch/x86/x86.mk for differences.

#

ARCH_X86_HAVE_SSSE3 := true

ARCH_X86_HAVE_MOVBE := true

core/combo/arch/x86/silvermont.mk

+1 −1
Original line number Diff line number Diff line 
# This file contains feature macro definitions specific to the

# silvermont arch variant.

#

# See build/core/combo/arch/x86/x86-atom.mk for differences.

# See build/make/core/combo/arch/x86/x86-atom.mk for differences.

#



ARCH_X86_HAVE_SSSE3  := true

core/combo/arch/x86_64/silvermont.mk

+1 −1
Original line number Diff line number Diff line 
# This file contains feature macro definitions specific to the

# silvermont arch variant.

#

# See build/core/combo/arch/x86/x86-atom.mk for differences.

# See build/make/core/combo/arch/x86/x86-atom.mk for differences.

#



ARCH_X86_HAVE_SSSE3  := true