diff options
| author | Spandan Das <spandandas@google.com> | 2024-04-26 00:20:10 +0000 |
|---|---|---|
| committer | Spandan Das <spandandas@google.com> | 2024-04-26 20:50:50 +0000 |
| commit | e18b9fee63c1ad00398b56b378e650bd073e67f6 (patch) | |
| tree | 44669e0529c01d8314a17758122977404ba98538 | |
| parent | c6e4a86b0391830ccc2ee6e81be2482a2dc6e659 (diff) | |
| download | build-e18b9fee63c1ad00398b56b378e650bd073e67f6.tar.gz | |
Drop cmdgoals special case from prebuilt selection
Before trunk stable, this check ensured that `docs` and `sdk` builds
contained all the apis provided by an apex. If source apex was used, it
would use the source java_sdk_library. If prebuilt apex was used, it
would use the prebuilt java_sdk_library.
After trunk stable, all release configurations for platform development
use the everything stubs of source java_sdk_library for javac, and
exportable stubs of source java_sdk_library for sdk/docs. The exportable
stubs is aware of the enabled flags for a specific release
configuration.
Since sdk and docs builds use the exportable stubs, we can drop this
special case to use the prebuilt stubs/srcjar files.
Test: presubmits
Test: in internal, lunch cf_x86_64_phone-next-userdebug (currently uses
bt prebuilts)
Test: m docs
Test: aninja -t path docs
out/soong/.intermediates/packages/modules/Bluetooth/framework/framework-bluetooth.stubs.source/android_common/exportable/framework-bluetooth.stubs.source-stubs.srcjar;
still exists after this cl
Bug: 308188056
Change-Id: I65da9f25634f0e8c3d514a4c175f89c3e5eb9712
| -rw-r--r-- | core/android_soong_config_vars.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index 56da5741e7..d8a7b9dd7c 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -50,8 +50,6 @@ endif ifneq (,$(MODULE_BUILD_FROM_SOURCE)) # Keep an explicit setting. -else ifeq (,$(filter docs sdk win_sdk sdk_addon,$(MAKECMDGOALS))) - MODULE_BUILD_FROM_SOURCE := true else ifneq (,$(PRODUCT_MODULE_BUILD_FROM_SOURCE)) # Let products override the branch default. MODULE_BUILD_FROM_SOURCE := $(PRODUCT_MODULE_BUILD_FROM_SOURCE) |