Merge "Fix duplicate and dangling rules" am: f9f8b21af3 am: 50d2ffdfe3
am: 348d20bcce
Change-Id: I495a6d0a8c733c942248e1d378c9f660e1cc7322
diff --git a/core/java.mk b/core/java.mk
index f182763..1ddd23a 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -639,6 +639,7 @@
$(call define-jar-to-toc-rule, $(full_classes_jar))
+ifneq ($(LOCAL_IS_STATIC_JAVA_LIBRARY),true)
ifndef LOCAL_JACK_ENABLED
$(built_dex_intermediate): PRIVATE_DX_FLAGS := $(LOCAL_DX_FLAGS)
# If you instrument class files that have local variable debug information in
@@ -660,6 +661,8 @@
$(hide) rm -f $(dir $@)/classes*.dex
$(hide) cp -fp $(dir $<)/classes*.dex $(dir $@)
+endif # !LOCAL_IS_STATIC_JAVA_LIBRARY
+
findbugs_xml := $(intermediates.COMMON)/findbugs.xml
$(findbugs_xml): PRIVATE_AUXCLASSPATH := $(addprefix -auxclasspath ,$(strip \
$(call normalize-path-list,$(filter %.jar,$(full_java_libs)))))
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 :=
diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk
index cb18613..3bfdd2d 100644
--- a/core/prebuilt_internal.mk
+++ b/core/prebuilt_internal.mk
@@ -436,16 +436,12 @@
# for host java libraries deps should be in the common dir, so we make a copy in
# the common dir.
common_classes_jar := $(intermediates.COMMON)/classes.jar
-common_javalib_jar := $(intermediates.COMMON)/javalib.jar
-$(common_classes_jar) $(common_javalib_jar): PRIVATE_MODULE := $(LOCAL_MODULE)
+$(common_classes_jar): PRIVATE_MODULE := $(LOCAL_MODULE)
$(common_classes_jar) : $(my_src_jar)
$(transform-prebuilt-to-target)
-$(common_javalib_jar) : $(common_classes_jar)
- $(transform-prebuilt-to-target)
-
else # !LOCAL_IS_HOST_MODULE
# for target java libraries, the LOCAL_BUILT_MODULE is in a product-specific dir,
# while the deps should be in the common dir, so we make a copy in the common dir.