Merge "Remove Fuchsia support from Make"

This commit is contained in:
Colin Cross
2021-07-23 17:15:45 +00:00
committed by Gerrit Code Review

View File

@@ -54,10 +54,6 @@ else ifneq (,$(filter true,$(NATIVE_COVERAGE) $(CLANG_COVERAGE)))
else ifneq (,$(SANITIZE_TARGET)$(SANITIZE_HOST)) else ifneq (,$(SANITIZE_TARGET)$(SANITIZE_HOST))
# Prebuilts aren't built with sanitizers either. # Prebuilts aren't built with sanitizers either.
SOONG_CONFIG_art_module_source_build := true SOONG_CONFIG_art_module_source_build := true
else ifneq (,$(PRODUCT_FUCHSIA))
# Fuchsia picks out ART internal packages that aren't available in the
# prebuilt.
SOONG_CONFIG_art_module_source_build := true
else ifeq (,$(filter x86 x86_64,$(HOST_CROSS_ARCH))) else ifeq (,$(filter x86 x86_64,$(HOST_CROSS_ARCH)))
# We currently only provide prebuilts for x86 on host. This skips prebuilts in # We currently only provide prebuilts for x86 on host. This skips prebuilts in
# cuttlefish builds for ARM servers. # cuttlefish builds for ARM servers.