diff options
| -rw-r--r-- | Android.mk | 28 | ||||
| -rw-r--r-- | build/Android.common_path.mk | 14 | ||||
| -rw-r--r-- | tools/ahat/Android.mk | 7 |
3 files changed, 24 insertions, 25 deletions
diff --git a/Android.mk b/Android.mk index 5da9bdd236..4ff857bae1 100644 --- a/Android.mk +++ b/Android.mk @@ -98,29 +98,13 @@ include $(art_path)/libart_fake/Android.mk # ART_HOST_DEPENDENCIES depends on Android.executable.mk above for ART_HOST_EXECUTABLES ART_HOST_DEPENDENCIES := \ - $(ART_HOST_EXECUTABLES) \ - $(HOST_OUT_JAVA_LIBRARIES)/core-libart-hostdex.jar \ - $(HOST_OUT_JAVA_LIBRARIES)/core-oj-hostdex.jar \ - $(ART_HOST_OUT_SHARED_LIBRARIES)/libjavacore$(ART_HOST_SHLIB_EXTENSION) \ - $(ART_HOST_OUT_SHARED_LIBRARIES)/libopenjdk$(ART_HOST_SHLIB_EXTENSION) \ - $(ART_HOST_OUT_SHARED_LIBRARIES)/libopenjdkjvm$(ART_HOST_SHLIB_EXTENSION) + $(ART_HOST_EXECUTABLES) \ + $(ART_HOST_DEX_DEPENDENCIES) \ + $(ART_HOST_SHARED_LIBRARY_DEPENDENCIES) ART_TARGET_DEPENDENCIES := \ - $(ART_TARGET_EXECUTABLES) \ - $(TARGET_OUT_JAVA_LIBRARIES)/core-libart.jar \ - $(TARGET_OUT_JAVA_LIBRARIES)/core-oj.jar \ - $(TARGET_OUT_SHARED_LIBRARIES)/libjavacore.so \ - $(TARGET_OUT_SHARED_LIBRARIES)/libopenjdk.so \ - $(TARGET_OUT_SHARED_LIBRARIES)/libopenjdkjvm.so -ifdef TARGET_2ND_ARCH -ART_TARGET_DEPENDENCIES += $(2ND_TARGET_OUT_SHARED_LIBRARIES)/libjavacore.so -ART_TARGET_DEPENDENCIES += $(2ND_TARGET_OUT_SHARED_LIBRARIES)/libopenjdk.so -ART_TARGET_DEPENDENCIES += $(2ND_TARGET_OUT_SHARED_LIBRARIES)/libopenjdkjvm.so -endif -ifdef HOST_2ND_ARCH -ART_HOST_DEPENDENCIES += $(2ND_HOST_OUT_SHARED_LIBRARIES)/libjavacore.so -ART_HOST_DEPENDENCIES += $(2ND_HOST_OUT_SHARED_LIBRARIES)/libopenjdk.so -ART_HOST_DEPENDENCIES += $(2ND_HOST_OUT_SHARED_LIBRARIES)/libopenjdkjvm.so -endif + $(ART_TARGET_EXECUTABLES) \ + $(ART_TARGET_DEX_DEPENDENCIES) \ + $(ART_TARGET_SHARED_LIBRARY_DEPENDENCIES) ######################################################################## # test rules diff --git a/build/Android.common_path.mk b/build/Android.common_path.mk index 7be1894680..b1644df529 100644 --- a/build/Android.common_path.mk +++ b/build/Android.common_path.mk @@ -99,4 +99,18 @@ HOST_JACK_CLASSPATH := $(abspath $(call intermediates-dir-for,JAV TARGET_JACK_CLASSPATH_DEPENDENCIES := $(call intermediates-dir-for,JAVA_LIBRARIES,core-oj, ,COMMON)/classes.jack $(call intermediates-dir-for,JAVA_LIBRARIES,core-libart, ,COMMON)/classes.jack TARGET_JACK_CLASSPATH := $(abspath $(call intermediates-dir-for,JAVA_LIBRARIES,core-oj, ,COMMON)/classes.jack):$(abspath $(call intermediates-dir-for,JAVA_LIBRARIES,core-libart, ,COMMON)/classes.jack) +ART_HOST_DEX_DEPENDENCIES := $(foreach jar,$(HOST_CORE_JARS),$(HOST_OUT_JAVA_LIBRARIES)/$(jar).jar) +ART_TARGET_DEX_DEPENDENCIES := $(foreach jar,$(TARGET_CORE_JARS),$(TARGET_OUT_JAVA_LIBRARIES)/$(jar).jar) + +ART_CORE_SHARED_LIBRARIES := libjavacore libopenjdk libopenjdkjvm +ART_HOST_SHARED_LIBRARY_DEPENDENCIES := $(foreach lib,$(ART_CORE_SHARED_LIBRARIES), $(ART_HOST_OUT_SHARED_LIBRARIES)/$(lib)$(ART_HOST_SHLIB_EXTENSION)) +ifdef HOST_2ND_ARCH +ART_HOST_SHARED_LIBRARY_DEPENDENCIES += $(foreach lib,$(ART_CORE_SHARED_LIBRARIES), $(2ND_HOST_OUT_SHARED_LIBRARIES)/$(lib).so) +endif + +ART_TARGET_SHARED_LIBRARY_DEPENDENCIES := $(foreach lib,$(ART_CORE_SHARED_LIBRARIES), $(TARGET_OUT_SHARED_LIBRARIES)/$(lib).so) +ifdef TARGET_2ND_ARCH +ART_TARGET_SHARED_LIBRARY_DEPENDENCIES += $(foreach lib,$(ART_CORE_SHARED_LIBRARIES), $(2ND_TARGET_OUT_SHARED_LIBRARIES)/$(lib).so) +endif + endif # ART_ANDROID_COMMON_PATH_MK diff --git a/tools/ahat/Android.mk b/tools/ahat/Android.mk index cfbafde52b..834426d3f6 100644 --- a/tools/ahat/Android.mk +++ b/tools/ahat/Android.mk @@ -66,9 +66,10 @@ AHAT_TEST_DUMP_HPROF := $(intermediates.COMMON)/test-dump.hprof # Run ahat-test-dump.jar to generate test-dump.hprof AHAT_TEST_DUMP_DEPENDENCIES := \ - $(ART_HOST_EXECUTABLES) \ - $(HOST_OUT_EXECUTABLES)/art \ - $(HOST_CORE_IMG_OUT_BASE)-optimizing-pic$(CORE_IMG_SUFFIX) + $(ART_HOST_EXECUTABLES) \ + $(ART_HOST_SHARED_LIBRARY_DEPENDENCIES) \ + $(HOST_OUT_EXECUTABLES)/art \ + $(HOST_CORE_IMG_OUT_BASE)-optimizing-pic$(CORE_IMG_SUFFIX) $(AHAT_TEST_DUMP_HPROF): PRIVATE_AHAT_TEST_ART := $(HOST_OUT_EXECUTABLES)/art $(AHAT_TEST_DUMP_HPROF): PRIVATE_AHAT_TEST_DUMP_JAR := $(AHAT_TEST_DUMP_JAR) |