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

Commit c048c9b5 authored by Ying Wang's avatar Ying Wang
Browse files

default empty tapas to TARGET_BUILD_APPS "all" 

So that "tapas" without argument won't end in makefile-could-not-load error in unbundled branch.
Also, the magic "all" apps will build only apps, not other things.

Change-Id: Iac6dd928ee4e42996147acdab31930cd4ffa1768
parent 3b85269c

core/base_rules.mk

+2 −0
Original line number Diff line number Diff line
@@ -491,6 +491,8 @@ ALL_MODULES += $(LOCAL_MODULE) 


# Don't use += on subvars, or else they'll end up being

# recursively expanded.

ALL_MODULES.$(LOCAL_MODULE).CLASS := \

    $(ALL_MODULES.$(LOCAL_MODULE).CLASS) $(LOCAL_MODULE_CLASS)

ALL_MODULES.$(LOCAL_MODULE).PATH := \

    $(ALL_MODULES.$(LOCAL_MODULE).PATH) $(LOCAL_PATH)

ALL_MODULES.$(LOCAL_MODULE).TAGS := \

core/main.mk

+2 −3
Original line number Diff line number Diff line
@@ -692,8 +692,8 @@ ifneq ($(TARGET_BUILD_APPS),) 


  unbundled_build_modules :=

  ifneq ($(filter all,$(TARGET_BUILD_APPS)),)

    # If they used the magic goal "all" then build everything

    unbundled_build_modules := $(sort $(call get-tagged-modules,$(ALL_MODULE_TAGS)))

    # If they used the magic goal "all" then build all apps in the source tree.

    unbundled_build_modules := $(foreach m,$(sort $(ALL_MODULES)),$(if $(filter APPS,$(ALL_MODULES.$(m).CLASS)),$(m)))

  else

    unbundled_build_modules := $(TARGET_BUILD_APPS)

  endif
@@ -786,4 +786,3 @@ modules: 
.PHONY: showcommands

showcommands:

	@echo >/dev/null

envsetup.sh

+3 −0
Original line number Diff line number Diff line
@@ -546,6 +546,9 @@ function tapas() 
    if [ -z "$variant" ]; then

        variant=eng

    fi

    if [ -z "$apps" ]; then

        apps=all

    fi



    export TARGET_PRODUCT=generic

    export TARGET_BUILD_VARIANT=$variant