diff options
| author | Ying Wang <wangying@google.com> | 2014-07-21 14:40:42 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-07-21 15:23:14 -0700 |
| commit | 88e199045bbe10296124203837b24dea116bf108 (patch) | |
| tree | 025a6733eaa53585970f3abcb6ac9a1e1ccacedc /tools | |
| parent | e5bcff624fb58b6f95be8ddff7f5b6b3bf5d19c7 (diff) | |
| download | frameworks_base-88e199045bbe10296124203837b24dea116bf108.zip frameworks_base-88e199045bbe10296124203837b24dea116bf108.tar.gz frameworks_base-88e199045bbe10296124203837b24dea116bf108.tar.bz2 | |
Build framework.jar with multidex support.
We don't need the framework/framework2 split now with the multidex
support.
Change-Id: I30ee5c7e24df87b2c54e854f17fbf0b5adef4c60
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/layoutlib/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/layoutlib/Android.mk b/tools/layoutlib/Android.mk index ead3b13..9300401 100644 --- a/tools/layoutlib/Android.mk +++ b/tools/layoutlib/Android.mk @@ -27,8 +27,8 @@ LOCAL_JAVACFLAGS := -source 6 -target 6 # 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 java-lib-deps,framework-base) -built_framework_classes := $(call java-lib-files,framework-base) +built_framework_dep := $(call java-lib-deps,framework) +built_framework_classes := $(call java-lib-files,framework) built_core_dep := $(call java-lib-deps,core-libart) built_core_classes := $(call java-lib-files,core-libart) |