Merge "Always turn on TARGET_BUILD_USE_PREBUILT_SDKS for unbundled build." am: ddfa3ff19c

Original change: https://android-review.googlesource.com/c/platform/build/+/2045278

Change-Id: I8a487ebbc8bfabfbc36a80d8a23b44a1f114d82a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2022-03-30 11:23:49 +00:00 committed by Automerger Merge Worker
commit c64f248280
2 changed files with 9 additions and 3 deletions

View file

@ -444,8 +444,12 @@ LOCAL_GENERATED_SOURCES += $(GEN)
<p>Unbundled build has several meanings by the context.
Let me explain the meaning by the flags related to "unbundled build"</p>
<h4>TARGET_BUILD_UNBUNDLED</h4>
<p>The source tree might not have the full platform sources. It is always set if
<code>TARGET_BUILD_APPS</code> or <code>TARGET_BUILD_UNBUNDLED_IMAGE</code> is set.</p>
<p>
The source tree might not have the full platform sources. It turns on
<code>TARGET_BUILD_USE_PREBUILT_SDKS</code>, unless
<code>UNBUNDLED_BUILD_SDKS_FROM_SOURCE</code> is set. It is always set if
<code>TARGET_BUILD_APPS</code> or <code>TARGET_BUILD_UNBUNDLED_IMAGE</code> is set.
</p>
<h4>TARGET_BUILD_USE_PREBUILT_SDKS</h4>
<p>It is an internal flag. If it is set, prebuilt SDKs are used, even if a module's
<code>LOCAL_SDK_VERSION</code> is <code>current</code> (including <code>system_current</code>,

View file

@ -496,7 +496,9 @@ TARGET_BUILD_USE_PREBUILT_SDKS :=
DISABLE_PREOPT :=
ifneq (,$(TARGET_BUILD_APPS)$(TARGET_BUILD_UNBUNDLED_IMAGE))
DISABLE_PREOPT := true
ifndef UNBUNDLED_BUILD_SDKS_FROM_SOURCE
endif
ifeq (true,$(TARGET_BUILD_UNBUNDLED))
ifneq (true,$(UNBUNDLED_BUILD_SDKS_FROM_SOURCE))
TARGET_BUILD_USE_PREBUILT_SDKS := true
endif
endif