Merge "Error if a Soong module attempts to install a classes jar"
This commit is contained in:
@@ -121,6 +121,11 @@ ifdef LOCAL_SOONG_DEX_JAR
|
|||||||
java-dex : $(common_javalib.jar)
|
java-dex : $(common_javalib.jar)
|
||||||
endif # LOCAL_UNINSTALLABLE_MODULE
|
endif # LOCAL_UNINSTALLABLE_MODULE
|
||||||
else # LOCAL_SOONG_DEX_JAR
|
else # LOCAL_SOONG_DEX_JAR
|
||||||
|
ifndef LOCAL_UNINSTALLABLE_MODULE
|
||||||
|
ifndef LOCAL_IS_HOST_MODULE
|
||||||
|
$(call pretty-error,Installable device module must have LOCAL_SOONG_DEX_JAR set)
|
||||||
|
endif
|
||||||
|
endif
|
||||||
$(eval $(call copy-one-file,$(full_classes_jar),$(LOCAL_BUILT_MODULE)))
|
$(eval $(call copy-one-file,$(full_classes_jar),$(LOCAL_BUILT_MODULE)))
|
||||||
endif # LOCAL_SOONG_DEX_JAR
|
endif # LOCAL_SOONG_DEX_JAR
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user