aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Cross2019-01-14 14:49:24 -0600
committerColin Cross2019-01-14 14:50:08 -0600
commit1a2e9dc10c71e70648cf82254fe75e45ea7e6153 (patch)
tree6f043bdcd8925a7f945c80f4008d749572c9bc35
parent2e77d4ee2c0f8f8a7fa815823b6563bbe37670db (diff)
downloadplatform-build-1a2e9dc10c71e70648cf82254fe75e45ea7e6153.tar.gz
platform-build-1a2e9dc10c71e70648cf82254fe75e45ea7e6153.tar.xz
platform-build-1a2e9dc10c71e70648cf82254fe75e45ea7e6153.zip
Error if a Soong module attempts to install a classes jar
Only dex jars should be installed, make it an error to not provide a dex jar for an device installable java module. Bug: 122831369 Test: m checkbuild Change-Id: I99c5738e6053fbaa3dd22406f50b7a002555702c
-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