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

Commit ccc48163 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Fix ALLOW_MISSING_DEPENDENCIES in PDK builds 

ALLOW_MISSING_DEPENDENCIES was being set up before TARGET_BUILD_PDK, so
PDK builds were not triggering ALLOW_MISSING_DEPENDENCIES.

Bug: 62086238
Test: m -j nothing (check out/soong/soong.variables for AllowMissingDependencies)
Test: PDK_FUSION_PLATFORM_ZIP=test.zip m -j nothing (check AllowMissingDependencies)
Change-Id: I70919fbc7e397e55356cb467c6218cf6e7279c6c
parent 65b98cd3

core/config.mk

+17 −0
Original line number Diff line number Diff line
@@ -476,6 +476,23 @@ endif 


BUILD_PLATFORM_ZIP := $(filter platform platform-java,$(MAKECMDGOALS))



# ---------------------------------------------------------------

# Whether we can expect a full build graph

ALLOW_MISSING_DEPENDENCIES := $(filter true,$(ALLOW_MISSING_DEPENDENCIES))

ifneq ($(TARGET_BUILD_APPS),)

ALLOW_MISSING_DEPENDENCIES := true

endif

ifeq ($(TARGET_BUILD_PDK),true)

ALLOW_MISSING_DEPENDENCIES := true

endif

ifneq ($(filter true,$(SOONG_ALLOW_MISSING_DEPENDENCIES)),)

ALLOW_MISSING_DEPENDENCIES := true

endif

ifneq ($(ONE_SHOT_MAKEFILE),)

ALLOW_MISSING_DEPENDENCIES := true

endif

.KATI_READONLY := ALLOW_MISSING_DEPENDENCIES



#

# Tools that are prebuilts for TARGET_BUILD_APPS

#

core/envsetup.mk

+0 −17
Original line number Diff line number Diff line
@@ -78,23 +78,6 @@ $(foreach v,$(ENABLED_VERSIONS), \ 
# buildspec.mk.default and envsetup.sh.

CORRECT_BUILD_ENV_SEQUENCE_NUMBER := 13



# ---------------------------------------------------------------

# Whether we can expect a full build graph

ALLOW_MISSING_DEPENDENCIES := $(filter true,$(ALLOW_MISSING_DEPENDENCIES))

ifneq ($(TARGET_BUILD_APPS),)

ALLOW_MISSING_DEPENDENCIES := true

endif

ifeq ($(TARGET_BUILD_PDK),true)

ALLOW_MISSING_DEPENDENCIES := true

endif

ifneq ($(filter true,$(SOONG_ALLOW_MISSING_DEPENDENCIES)),)

ALLOW_MISSING_DEPENDENCIES := true

endif

ifneq ($(ONE_SHOT_MAKEFILE),)

ALLOW_MISSING_DEPENDENCIES := true

endif

.KATI_READONLY := ALLOW_MISSING_DEPENDENCIES



# ---------------------------------------------------------------

# The product defaults to generic on hardware

# NOTE: This will be overridden in product_config.mk if make