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

Commit 69a49f75 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge changes I21eb93f3,I0be5e272,I158b0d7e 

* changes:
  Build only modules required by the current product.
  Load only the current product config makefile.
  Run clean steps in only given paths when using mm/mmm
parents 8c37f49f e37c3dc3

core/base_rules.mk

+0 −3
Original line number Original line Diff line number Diff line
@@ -50,9 +50,6 @@ endif 
#$(shell rm -f tag-list.csv)

#$(shell rm -f tag-list.csv)

#tag-list-first-time := false

#tag-list-first-time := false

#endif

#endif

#comma := ,

#empty :=

#space := $(empty) $(empty)

#$(shell echo $(lastword $(filter-out config/% out/%,$(MAKEFILE_LIST))),$(LOCAL_MODULE),$(strip $(LOCAL_MODULE_CLASS)),$(subst $(space),$(comma),$(sort $(LOCAL_MODULE_TAGS))) >> tag-list.csv)

#$(shell echo $(lastword $(filter-out config/% out/%,$(MAKEFILE_LIST))),$(LOCAL_MODULE),$(strip $(LOCAL_MODULE_CLASS)),$(subst $(space),$(comma),$(sort $(LOCAL_MODULE_TAGS))) >> tag-list.csv)





LOCAL_UNINSTALLABLE_MODULE := $(strip $(LOCAL_UNINSTALLABLE_MODULE))

LOCAL_UNINSTALLABLE_MODULE := $(strip $(LOCAL_UNINSTALLABLE_MODULE))

core/cleanbuild.mk

+4 −0
Original line number Original line Diff line number Diff line
@@ -78,6 +78,10 @@ else 
    $(info Clean step: $(INTERNAL_CLEAN_STEP.$(step))) \

    $(info Clean step: $(INTERNAL_CLEAN_STEP.$(step))) \

    $(shell $(INTERNAL_CLEAN_STEP.$(step))) \

    $(shell $(INTERNAL_CLEAN_STEP.$(step))) \

   )

   )

  # If we are running mm/mmm, we should copy over the other clean steps too.

  ifneq ($(ONE_SHOT_MAKEFILE),)

    INTERNAL_CLEAN_STEPS := $(strip $(CURRENT_CLEAN_STEPS) $(steps))

  endif

  steps :=

  steps :=

endif

endif

CURRENT_CLEAN_BUILD_VERSION :=

CURRENT_CLEAN_BUILD_VERSION :=

core/cleanspec.mk

+7 −1
Original line number Original line Diff line number Diff line
@@ -63,7 +63,13 @@ INTERNAL_CLEAN_BUILD_VERSION := 6 
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

# ************************************************





ifneq ($(ONE_SHOT_MAKEFILE),)

cs_subdirs := $(dir $(ONE_SHOT_MAKEFILE))

else

cs_subdirs := .

endif

subdir_cleanspecs := \

subdir_cleanspecs := \

    $(shell build/tools/findleaves.py --prune=out --prune=.repo --prune=.git . CleanSpec.mk)

    $(shell build/tools/findleaves.py --prune=out --prune=.repo --prune=.git $(cs_subdirs) CleanSpec.mk)

include $(subdir_cleanspecs)

include $(subdir_cleanspecs)

cs_subdirs :=

subdir_cleanspecs :=
 
subdir_cleanspecs :=

core/config.mk

+5 −0
Original line number Original line Diff line number Diff line
@@ -14,6 +14,11 @@ else 
SHELL := /bin/bash

SHELL := /bin/bash

endif

endif





# Utility variables.

empty :=

space := $(empty) $(empty)

comma := ,



# Tell python not to spam the source tree with .pyc files.  This

# Tell python not to spam the source tree with .pyc files.  This

# only has an effect on python 2.6 and above.

# only has an effect on python 2.6 and above.

export PYTHONDONTWRITEBYTECODE := 1

export PYTHONDONTWRITEBYTECODE := 1

core/definitions.mk

+0 −4
Original line number Original line Diff line number Diff line
@@ -574,10 +574,6 @@ endef 
###########################################################

###########################################################

## Convert "a b c" into "a:b:c"

## Convert "a b c" into "a:b:c"

###########################################################

###########################################################



empty :=

space := $(empty) $(empty)



define normalize-path-list

define normalize-path-list

$(subst $(space),:,$(strip $(1)))

$(subst $(space),:,$(strip $(1)))

endef

endef