Fix duplicate and dangling rules
I6730e2d3ec38004874265b2a690442dec57b33f4 introduced duplicate rules
to build classes.jar for static java library prebuilts, and left rules
to copy $(built_dex_intermediates) to $(built_dex) for modules that
don't build dex files.
Move prebuilts LOCAL_BUILT_MODULE back to javalib.jar to match
non-prebuilt modules, and remove the manual building of javalib.jar.
Add a check around $(built_dex_intermediates) for static java libraries.
Bug: 36901093
Test: m -j ANDROID_COMPILE_WITH_JACK=false
Change-Id: I291510b56162f0d35553e3c7ccd59b1382224d62
diff --git a/core/multi_prebuilt.mk b/core/multi_prebuilt.mk
index c53d755..77c57ab 100644
--- a/core/multi_prebuilt.mk
+++ b/core/multi_prebuilt.mk
@@ -116,7 +116,7 @@
$(prebuilt_module_tags), \
, \
, \
- $(if $(prebuilt_is_host),classes.jar,javalib.jar))
+ javalib.jar)
$(call auto-prebuilt-boilerplate, \
$(prebuilt_static_java_libraries), \
@@ -125,7 +125,7 @@
$(prebuilt_module_tags), \
, \
true, \
- classes.jar)
+ javalib.jar)
prebuilt_static_libs :=
prebuilt_shared_libs :=