Fix build.
When doing the full build, javalib.jar wasn't created. However, mm had
created the javalib.jar. Fix the build by not depending on javalib.jar,
but on classes.jar
Change-Id: I643676b1d73cbfce42946a065a2ada6c50cc959a
diff --git a/tools/layoutlib/Android.mk b/tools/layoutlib/Android.mk
index a0bfe624..61ddb04 100644
--- a/tools/layoutlib/Android.mk
+++ b/tools/layoutlib/Android.mk
@@ -38,11 +38,9 @@
built_ext_data := $(call intermediates-dir-for, \
JAVA_LIBRARIES,ext,,COMMON)/javalib.jar
built_icudata_dep := $(call java-lib-deps,icu4j-icudata-jarjar)
-built_icudata_data := $(call intermediates-dir-for, \
- JAVA_LIBRARIES,icu4j-icudata-jarjar,,COMMON)/javalib.jar
+built_icudata_data := $(call java-lib-files,icu4j-icudata-jarjar)
built_icutzdata_dep := $(call java-lib-deps,icu4j-icutzdata-jarjar)
-built_icutzdata_data := $(call intermediates-dir-for, \
- JAVA_LIBRARIES,icu4j-icutzdata-jarjar,,COMMON)/javalib.jar
+built_icutzdata_data := $(call java-lib-files,icu4j-icutzdata-jarjar)
built_layoutlib_create_jar := $(call intermediates-dir-for, \
JAVA_LIBRARIES,layoutlib_create,HOST)/javalib.jar