diff options
Diffstat (limited to 'tools/layoutlib/Android.mk')
| -rw-r--r-- | tools/layoutlib/Android.mk | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/tools/layoutlib/Android.mk b/tools/layoutlib/Android.mk index 6d606a9..b27ce0e 100644 --- a/tools/layoutlib/Android.mk +++ b/tools/layoutlib/Android.mk @@ -25,15 +25,11 @@ include $(CLEAR_VARS) # We need to process the framework classes.jar file, but we can't # depend directly on it (private vars won't be inherited correctly). # So, we depend on framework's BUILT file. -built_framework_dep := \ - $(call intermediates-dir-for,JAVA_LIBRARIES,framework)/javalib.jar -built_framework_classes := \ - $(call intermediates-dir-for,JAVA_LIBRARIES,framework)/classes.jar +built_framework_dep := $(call java-lib-deps,framework) +built_framework_classes := $(call java-lib-files,framework) -built_core_dep := \ - $(call intermediates-dir-for,JAVA_LIBRARIES,core)/javalib.jar -built_core_classes := \ - $(call intermediates-dir-for,JAVA_LIBRARIES,core)/classes.jar +built_core_dep := $(call java-lib-deps,core) +built_core_classes := $(call java-lib-files,core) built_layoutlib_create_jar := $(call intermediates-dir-for, \ JAVA_LIBRARIES,layoutlib_create,HOST)/javalib.jar @@ -52,13 +48,15 @@ include $(BUILD_SYSTEM)/base_rules.mk $(LOCAL_BUILT_MODULE): $(built_core_dep) \ $(built_framework_dep) \ $(built_layoutlib_create_jar) - @echo "host layoutlib_create: $@" - @mkdir -p $(dir $@) - @rm -f $@ + $(hide) echo "host layoutlib_create: $@" + $(hide) mkdir -p $(dir $@) + $(hide) rm -f $@ + $(hide) ls -l $(built_framework_classes) $(hide) java -jar $(built_layoutlib_create_jar) \ $@ \ $(built_core_classes) \ $(built_framework_classes) + $(hide) ls -l $(built_framework_classes) # |