diff options
| author | Ying Wang <wangying@google.com> | 2010-09-28 15:06:10 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-28 15:06:10 -0700 |
| commit | 292c246b27319bc2195e2b3dbc3c3adea22db672 (patch) | |
| tree | 74f3ed88285fa86dd0ec07ebfc7deadb6da9db26 | |
| parent | 320cdcb122505ba703326a102f9b13d2f2f8847a (diff) | |
| parent | c486da4887811bce4895199c3116616b3638f35a (diff) | |
| download | frameworks_base-292c246b27319bc2195e2b3dbc3c3adea22db672.zip frameworks_base-292c246b27319bc2195e2b3dbc3c3adea22db672.tar.gz frameworks_base-292c246b27319bc2195e2b3dbc3c3adea22db672.tar.bz2 | |
Merge "Call functions to calculate deps and classes.jar" into gingerbread
| -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 |