From 86e74b96fcc46d6d6c3758b13cca755c12e7de8a Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Mon, 22 Feb 2016 15:54:27 -0800 Subject: [PATCH] Make sure my_src_jar is set up properly for host prebuilt jar Make sure my_src_jar is set up properly for host prebuilt jar when we need to generate host .jack for host dalvik java libraries. Change-Id: If85e27147cdc6e6a7a154c1cf308f9d0a71ff068 --- core/prebuilt_internal.mk | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk index 3578c46f3d..286670bdf0 100644 --- a/core/prebuilt_internal.mk +++ b/core/prebuilt_internal.mk @@ -289,7 +289,9 @@ endif endif endif # LOCAL_MODULE_CLASS != APPS -ifeq ($(LOCAL_IS_HOST_MODULE)$(LOCAL_MODULE_CLASS),JAVA_LIBRARIES) +ifeq ($(LOCAL_MODULE_CLASS),JAVA_LIBRARIES) +my_src_jar := $(my_prebuilt_src_file) +ifeq ($(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. # For nonstatic library, $(common_javalib_jar) is the dependency file, @@ -309,9 +311,6 @@ $(my_src_jar) : $(my_prebuilt_src_file) # Make sure the extracted classes.jar has a new timestamp. $(hide) touch $@ -else -# This is jar file. -my_src_jar := $(my_prebuilt_src_file) endif $(common_classes_jar) : $(my_src_jar) | $(ACP) $(transform-prebuilt-to-target) @@ -323,14 +322,13 @@ $(call define-jar-to-toc-rule, $(common_classes_jar)) # make sure the classes.jar and javalib.jar are built before $(LOCAL_BUILT_MODULE) $(built_module) : $(common_javalib_jar) -endif # TARGET JAVA_LIBRARIES - -ifeq ($(LOCAL_MODULE_CLASS),JAVA_LIBRARIES) +endif # LOCAL_IS_HOST_MODULE is not set ifneq ($(LOCAL_JILL_FLAGS),) $(error LOCAL_JILL_FLAGS is not supported any more, please use jack options in LOCAL_JACK_FLAGS instead) endif +# We may be building classes.jack from a host jar for host dalvik Java library. $(intermediates.COMMON)/classes.jack : PRIVATE_JACK_FLAGS:=$(LOCAL_JACK_FLAGS) $(intermediates.COMMON)/classes.jack : $(my_src_jar) $(LOCAL_MODULE_MAKEFILE_DEP) \ $(LOCAL_ADDITIONAL_DEPENDENCIES) $(JACK) | setup-jack-server