Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a2e9dc1 authored by Colin Cross's avatar Colin Cross
Browse files

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
parent 2e77d4ee

core/soong_java_prebuilt.mk

+5 −0
Original line number Diff line number Diff line
@@ -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