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

Commit a3c35f23 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Error if a Soong module attempts to install a classes jar" 

am: 63d012f9

Change-Id: I9e373df7eb962ac8e5c4dafaf21fc676b55ca38a
parents 205f1a39 63d012f9

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