Commit e18b9fee authored Apr 26, 2024 by Spandan Das

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

parent c6e4a86b

core/android_soong_config_vars.mk

+0 −2

Original line number	Diff line number	Diff line
		@@ -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)