p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Fix duplicate and dangling rules" am: f9f8b21af3 

am: 50d2ffdfe3

Change-Id: I20b39bbaf3ba642b10f4364beb4b580d2a5a7ac1
This commit is contained in:
Colin Cross 2017-04-06 20:03:30 +00:00 committed by android-build-merger
parent 09018269a8 50d2ffdfe3
commit 348d20bcce
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/java.mk
View File

@ -629,6 +629,7 @@ $(eval $(call copy-one-file,$(full_classes_proguard_jar),$(full_classes_jar)))
$(call define-jar-to-toc-rule, $(full_classes_jar)) $(call define-jar-to-toc-rule, $(full_classes_jar))
ifneq ($(LOCAL_IS_STATIC_JAVA_LIBRARY),true)
ifndef LOCAL_JACK_ENABLED ifndef LOCAL_JACK_ENABLED
$(built_dex_intermediate): PRIVATE_DX_FLAGS := $(LOCAL_DX_FLAGS) $(built_dex_intermediate): PRIVATE_DX_FLAGS := $(LOCAL_DX_FLAGS)
# If you instrument class files that have local variable debug information in # If you instrument class files that have local variable debug information in
@ -650,6 +651,8 @@ $(built_dex): $(built_dex_intermediate)
$(hide) rm -f $(dir $@)/classes*.dex $(hide) rm -f $(dir $@)/classes*.dex
$(hide) cp -fp $(dir $<)/classes*.dex $(dir $@) $(hide) cp -fp $(dir $<)/classes*.dex $(dir $@)
endif # !LOCAL_IS_STATIC_JAVA_LIBRARY
findbugs_xml := $(intermediates.COMMON)/findbugs.xml findbugs_xml := $(intermediates.COMMON)/findbugs.xml
$(findbugs_xml): PRIVATE_AUXCLASSPATH := $(addprefix -auxclasspath ,$(strip \ $(findbugs_xml): PRIVATE_AUXCLASSPATH := $(addprefix -auxclasspath ,$(strip \
$(call normalize-path-list,$(filter %.jar,$(full_java_libs))))) $(call normalize-path-list,$(filter %.jar,$(full_java_libs)))))

4
core/multi_prebuilt.mk
View File

@ -116,7 +116,7 @@ $(call auto-prebuilt-boilerplate, \
$(prebuilt_module_tags), \ $(prebuilt_module_tags), \
, \ , \
, \ , \
$(if $(prebuilt_is_host),classes.jar,javalib.jar)) javalib.jar)
$(call auto-prebuilt-boilerplate, \ $(call auto-prebuilt-boilerplate, \
$(prebuilt_static_java_libraries), \ $(prebuilt_static_java_libraries), \
@ -125,7 +125,7 @@ $(call auto-prebuilt-boilerplate, \
$(prebuilt_module_tags), \ $(prebuilt_module_tags), \
, \ , \
true, \ true, \
classes.jar) javalib.jar)
prebuilt_static_libs := prebuilt_static_libs :=
prebuilt_shared_libs := prebuilt_shared_libs :=

6
core/prebuilt_internal.mk
View File

@ -438,16 +438,12 @@ ifdef LOCAL_IS_HOST_MODULE
# for host java libraries deps should be in the common dir, so we make a copy in # for host java libraries deps should be in the common dir, so we make a copy in
# the common dir. # the common dir.
common_classes_jar := $(intermediates.COMMON)/classes.jar 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) $(common_classes_jar) : $(my_src_jar)
$(transform-prebuilt-to-target) $(transform-prebuilt-to-target)
$(common_javalib_jar) : $(common_classes_jar)
$(transform-prebuilt-to-target)
else # !LOCAL_IS_HOST_MODULE else # !LOCAL_IS_HOST_MODULE
# for target java libraries, the LOCAL_BUILT_MODULE is in a product-specific dir, # 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. # while the deps should be in the common dir, so we make a copy in the common dir.