diff options
| author | 2019-01-15 17:40:28 +0000 | |
|---|---|---|
| committer | 2019-01-15 17:40:28 +0000 | |
| commit | 63d012f987eeefb3b50b1780726fb9c20c7cd48c (patch) | |
| tree | b778f10b5dd7c7c7198c4375db2e769a97cf8e2c | |
| parent | fc598781c6ad4bf12c82244ec27ba8bc3b85ad0c (diff) | |
| parent | 1a2e9dc10c71e70648cf82254fe75e45ea7e6153 (diff) | |
Merge "Error if a Soong module attempts to install a classes jar"
| -rw-r--r-- | core/soong_java_prebuilt.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/soong_java_prebuilt.mk b/core/soong_java_prebuilt.mk index a62590d84a..cfda44e0ec 100644 --- a/core/soong_java_prebuilt.mk +++ b/core/soong_java_prebuilt.mk @@ -121,6 +121,11 @@ ifdef LOCAL_SOONG_DEX_JAR java-dex : $(common_javalib.jar) endif # LOCAL_UNINSTALLABLE_MODULE 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))) endif # LOCAL_SOONG_DEX_JAR |