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

Commit ad0ef270 authored by Anton Hansson's avatar Anton Hansson
Browse files

Don't exclude docs build from using prebuilts 

Even though it doesn't have google modules in PRODUCT_PACKAGES,
the docs build wants to use prebuilts when the rest of the branch
does.

Bug: 230478310
Test: m docs (inspect MODULE_BUILD_FROM_SOURCE)
Change-Id: I1d67f4099e9fdc5fbaeeb0bf0fce80aa91c05eb5
parent 99b87147

core/android_soong_config_vars.mk

+2 −2
Original line number Original line Diff line number Diff line
@@ -93,13 +93,13 @@ endif 




ifneq (,$(MODULE_BUILD_FROM_SOURCE))

ifneq (,$(MODULE_BUILD_FROM_SOURCE))

  # Keep an explicit setting.

  # Keep an explicit setting.

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

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

  # Prebuilt module SDKs require prebuilt modules to work, and currently

  # Prebuilt module SDKs require prebuilt modules to work, and currently

  # prebuilt modules are only provided for com.google.android.xxx. If we can't

  # prebuilt modules are only provided for com.google.android.xxx. If we can't

  # find one of them in PRODUCT_PACKAGES then assume com.android.xxx are in use,

  # find one of them in PRODUCT_PACKAGES then assume com.android.xxx are in use,

  # and disable prebuilt SDKs. In particular this applies to AOSP builds.

  # and disable prebuilt SDKs. In particular this applies to AOSP builds.

  #

  #

  # However, sdk/win_sdk/sdk_addon builds might not include com.google.android.xxx

  # However, docs/sdk/win_sdk/sdk_addon builds might not include com.google.android.xxx

  # packages, so for those we respect the default behavior.

  # packages, so for those we respect the default behavior.

  MODULE_BUILD_FROM_SOURCE := true

  MODULE_BUILD_FROM_SOURCE := true

else ifneq (,$(PRODUCT_MODULE_BUILD_FROM_SOURCE))

else ifneq (,$(PRODUCT_MODULE_BUILD_FROM_SOURCE))