diff options
| author | Ying Wang <wangying@google.com> | 2010-09-28 17:38:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-28 17:38:19 -0700 |
| commit | 1e57996f47e9d7f96506e2d680eea9f1d7ecc7ac (patch) | |
| tree | 0906b44f43359e84cd44cd69e954092f12702806 /tools | |
| parent | 9783052ec1260985f4e08f4dada6331445ce538e (diff) | |
| parent | 0e8dc464bdfa29785aab7be6343154fee361f6a0 (diff) | |
| download | frameworks_base-1e57996f47e9d7f96506e2d680eea9f1d7ecc7ac.zip frameworks_base-1e57996f47e9d7f96506e2d680eea9f1d7ecc7ac.tar.gz frameworks_base-1e57996f47e9d7f96506e2d680eea9f1d7ecc7ac.tar.bz2 | |
am 0e8dc464: am 292c246b: Merge "Call functions to calculate deps and classes.jar" into gingerbread
Merge commit '0e8dc464bdfa29785aab7be6343154fee361f6a0'
* commit '0e8dc464bdfa29785aab7be6343154fee361f6a0':
Call functions to calculate deps and classes.jar
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/layoutlib/Android.mk | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/tools/layoutlib/Android.mk b/tools/layoutlib/Android.mk index 135a633..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 |