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

Commit 06c6eb79 authored by Spandan Das's avatar Spandan Das Committed by Gerrit Code Review
Browse files

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

parents acfb82cf 9448b6fb

core/android_soong_config_vars.mk

+0 −6
Original line number Original line Diff line number Diff line
@@ -75,12 +75,6 @@ ifeq (arm64,${HOST_CROSS_ARCH}) 
  BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true

  BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true

endif

endif





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

# for now and fix in a follow up.

ifneq (,$(filter tv,$(subst $(comma),$(space),${PRODUCT_CHARACTERISTICS})))

  BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true

endif



ifneq (,$(MODULE_BUILD_FROM_SOURCE))

ifneq (,$(MODULE_BUILD_FROM_SOURCE))

  # Keep an explicit setting.

  # 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)))

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)))