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

Commit 8878beb6 authored by Martin Stjernholm's avatar Martin Stjernholm
Browse files

Skip the platform availability check for unbundled builds. 

Necessary to be able to use the standard Mainline module targets
aosp_${ARCH} on unbundled branches.

Also clean up a superfluous ")" that got added to the
not_installable_file target.

Test: m TARGET_PRODUCT=aosp_arm64 com.android.art
Bug: 172480615
Change-Id: Id85d0ffc8fe90c3e861666e6e2db963e0d9468a2
parent 187e9759

core/tasks/platform_availability_check.mk

+6 −1
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ 
# Check whether there is any module that isn't available for platform

# is installed to the platform.



# Skip for unbundled builds that don't produce a platform image.

ifeq (,$(TARGET_BUILD_UNBUNDLED))



# Filter FAKE and NON_INSTALLABLE modules out and then collect those are not

# available for platform

_modules_not_available_for_platform := \
@@ -41,7 +44,7 @@ else 
# Don't error out immediately when ALLOW_MISSING_DEPENDENCIES is set.

# Instead, add a dependency on a rule that prints the error message.

  define not_available_for_platform_rule

    not_installable_file := $(patsubst $(OUT_DIR)/%,$(OUT_DIR)/NOT_AVAILABLE_FOR_PLATFORM/%,$(1)))

    not_installable_file := $(patsubst $(OUT_DIR)/%,$(OUT_DIR)/NOT_AVAILABLE_FOR_PLATFORM/%,$(1))

    $(1): $$(not_installable_file)

    $$(not_installable_file):

	$(call echo-error,$(2),Module is requested to be installed but is not \
@@ -54,3 +57,5 @@ it depends on other modules that are not available for platform.) 
    $(foreach i,$(filter-out $(HOST_OUT)/%,$(ALL_MODULES.$(m).INSTALLED)),\

      $(eval $(call not_available_for_platform_rule,$(i),$(m)))))

endif



endif