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

Commit 542c7412 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Drop special-casing of atv in source/prebuilt selection" into main

parents e78d4ed2 f01a7d82

core/android_soong_config_vars.mk

+0 −6
Original line number Diff line number Diff line
@@ -81,12 +81,6 @@ ifneq (,$(filter tv,$(subst $(comma),$(space),${PRODUCT_CHARACTERISTICS}))) 
  BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true

endif



# ATV based devices do not seem to work with prebuilts, so build from source

# for now and fix in a follow up.

ifneq (,${PRODUCT_IS_ATV})

  BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true

endif



ifneq (,$(MODULE_BUILD_FROM_SOURCE))

  # Keep an explicit setting.

else ifeq (,$(filter docs sdk win_sdk sdk_addon,$(MAKECMDGOALS))$(findstring com.google.android.conscrypt,$(PRODUCT_PACKAGES))$(findstring com.google.android.go.conscrypt,$(PRODUCT_PACKAGES)))