commit 4974879c32adc8285fd4407c49919e01b54b09d6
author Ying Wang <wangying@google.com> Wed Feb 27 23:10:12 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 27 23:10:12 2013 +0000
tree 7d4cac7a7cbed4f018d7ac90e5cd403cc03dc9af
parent 25ba3b0975a623e97c2e6d0601e9590fb36de960
parent 087d4ee3edbebf3719ff043210cf67bb223d8fdf

Merge "Switch target java library dependency file from javalib.jar to classes.jar" into jb-mr2-dev

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index a4551fa..1b8afe9 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -538,7 +538,7 @@
 # $(1): library name
 # $(2): Non-empty if IS_HOST_MODULE
 define _java-lib-full-dep
-$(call _java-lib-dir,$(1),$(2))/javalib$(COMMON_JAVA_PACKAGE_SUFFIX)
+$(call _java-lib-dir,$(1),$(2))/$(if $(2) javalib,classes)$(COMMON_JAVA_PACKAGE_SUFFIX)
 endef
 
 # $(1): library name list