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

Commit d1378dec authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge changes I5e684409,I4fa35540,I24015ef0 

am: 93de7774

Change-Id: I2ac9d2922435058bcd900f902c308736f6710bed
parents d9b77384 93de7774

core/base_rules.mk

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ endif 
# makefiles. Anything else is either a typo or a source of unexpected

# behaviors.

ifneq ($(filter-out debug eng tests optional samples,$(my_module_tags)),)

$(warning unusual tags $(my_module_tags) on $(LOCAL_MODULE) at $(LOCAL_PATH))

$(call pretty-warning,unusual tags $(my_module_tags))

endif



# Add implicit tags.

core/product_config.mk

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ $(foreach f, $(all_product_configs),\ 
    $(eval _cpm_word2 := $(word 2,$(_cpm_words)))\

    $(if $(_cpm_word2),\

        $(eval all_product_makefiles += $(_cpm_word2))\

        $(eval all_named_products += $(_cpm_word2))\

        $(eval all_named_products += $(_cpm_word1))\

        $(if $(filter $(TARGET_PRODUCT),$(_cpm_word1)),\

            $(eval current_product_makefile += $(_cpm_word2)),),\

        $(eval all_product_makefiles += $(f))\

core/tasks/tools/package-modules.mk

+2 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#

#



my_makefile := $(lastword $(filter-out $(lastword $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))

my_staging_dir := $(call intermediates-dir-for,PACKAGING,$(my_package_name))

my_built_modules :=

my_copy_pairs :=
@@ -33,7 +34,7 @@ $(foreach m,$(my_modules_and_deps),\ 
  $(eval _built_files := $(strip $(ALL_MODULES.$(m).BUILT_INSTALLED)\

    $(ALL_MODULES.$(m)$(TARGET_2ND_ARCH_MODULE_SUFFIX).BUILT_INSTALLED)))\

  $(if $(_pickup_files)$(_built_files),,\

    $(warning Unknown installed file for module '$(m)'))\

    $(shell $(call echo-warning,$(my_makefile),$(my_package_name): Unknown installed file for module '$(m)')))\

  $(eval my_pickup_files += $(_pickup_files))\

  $(foreach i, $(_built_files),\

    $(eval bui_ins := $(subst :,$(space),$(i)))\

tools/kati_all_products.sh

deleted100755 → 0
+0 −7
Original line number Diff line number Diff line 
#!/bin/bash -e



cd $ANDROID_BUILD_TOP

mkdir -p out.kati

source build/envsetup.sh



get_build_var all_named_products | sed "s/ /\n/g" | parallel "$@" --progress "(source build/envsetup.sh; lunch {}-eng && m -j OUT_DIR=out.kati/{} out.kati/{}/build-{}.ninja) >out.kati/log.{} 2>&1"