tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't depend on classes-header.jar when turbine is disabled

Browse source 
TARGET_BUILD_APPS sets TURBINE_ENABLED := false, which triggers
an issue where a dependency is added on classes-header.jar but
there is no rule to create it.  Skip creating the dependency
when TURBINE_ENABLED is false for now.

Bug: 123183568
Test: m TARGET_PRODUCT=mainline_modules_arm UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true TARGET_BUILD_APPS=com.android.media
Change-Id: I8ec3e244b8f9618c58f4ac57329a5a07f01dc797
This commit is contained in:
Colin Cross 2019-01-21 10:59:42 -08:00
parent 4ac7810755
commit b405fe3765
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/soong_java_prebuilt.mk
View file

@ -95,7 +95,10 @@ ifdef LOCAL_SOONG_DEX_JAR
$(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(common_javalib.jar)))
$(eval $(call add-dependency,$(LOCAL_BUILT_MODULE),$(common_javalib.jar)))
$(eval $(call add-dependency,$(common_javalib.jar),$(full_classes_jar) $(full_classes_header_jar)))
$(eval $(call add-dependency,$(common_javalib.jar),$(full_classes_jar)))
ifneq ($(TURBINE_ENABLED),false)
$(eval $(call add-dependency,$(common_javalib.jar),$(full_classes_header_jar)))
endif
endif
java-dex : $(LOCAL_BUILT_MODULE)