drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 292c246b: Merge "Call functions to calculate deps and classes.jar" into gingerbread

Browse Source 
Merge commit '292c246b27319bc2195e2b3dbc3c3adea22db672' into gingerbread-plus-aosp

* commit '292c246b27319bc2195e2b3dbc3c3adea22db672':
  Call functions to calculate deps and classes.jar
This commit is contained in:
Ying Wang
2010-09-28 15:09:49 -07:00
committed by Android Git Automerger
parent df31e03c47 292c246b27
commit 0e8dc464bd
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/layoutlib/Android.mk
View File

@ -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