aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot2019-01-15 11:40:28 -0600
committerGerrit Code Review2019-01-15 11:40:28 -0600
commit63d012f987eeefb3b50b1780726fb9c20c7cd48c (patch)
treeb778f10b5dd7c7c7198c4375db2e769a97cf8e2c
parentfc598781c6ad4bf12c82244ec27ba8bc3b85ad0c (diff)
parent1a2e9dc10c71e70648cf82254fe75e45ea7e6153 (diff)
downloadplatform-build-63d012f987eeefb3b50b1780726fb9c20c7cd48c.tar.gz
platform-build-63d012f987eeefb3b50b1780726fb9c20c7cd48c.tar.xz
platform-build-63d012f987eeefb3b50b1780726fb9c20c7cd48c.zip
Merge "Error if a Soong module attempts to install a classes jar"
-rw-r--r--core/soong_java_prebuilt.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/soong_java_prebuilt.mk b/core/soong_java_prebuilt.mk
index a62590d84..cfda44e0e 100644
--- a/core/soong_java_prebuilt.mk
+++ b/core/soong_java_prebuilt.mk
@@ -121,6 +121,11 @@ ifdef LOCAL_SOONG_DEX_JAR
121 java-dex : $(common_javalib.jar) 121 java-dex : $(common_javalib.jar)
122 endif # LOCAL_UNINSTALLABLE_MODULE 122 endif # LOCAL_UNINSTALLABLE_MODULE
123else # LOCAL_SOONG_DEX_JAR 123else # LOCAL_SOONG_DEX_JAR
124 ifndef LOCAL_UNINSTALLABLE_MODULE
125 ifndef LOCAL_IS_HOST_MODULE
126 $(call pretty-error,Installable device module must have LOCAL_SOONG_DEX_JAR set)
127 endif
128 endif
124 $(eval $(call copy-one-file,$(full_classes_jar),$(LOCAL_BUILT_MODULE))) 129 $(eval $(call copy-one-file,$(full_classes_jar),$(LOCAL_BUILT_MODULE)))
125endif # LOCAL_SOONG_DEX_JAR 130endif # LOCAL_SOONG_DEX_JAR
126 131