diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-06-19 02:08:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-19 02:08:10 +0000 |
| commit | 80f1fe5f7cc80b6f1da142c782ccbbad45d878a8 (patch) | |
| tree | 995aab8fd3567fb9b83b1309d23f78be918f1912 /tools | |
| parent | 3aa4de11b05599d75af92a15820731144941c38f (diff) | |
| parent | f8077cf2d7ee55dbf02ec0c65a05db7e5c2fabfc (diff) | |
| download | frameworks_base-80f1fe5f7cc80b6f1da142c782ccbbad45d878a8.zip frameworks_base-80f1fe5f7cc80b6f1da142c782ccbbad45d878a8.tar.gz frameworks_base-80f1fe5f7cc80b6f1da142c782ccbbad45d878a8.tar.bz2 | |
am f8077cf2: am 8e21e215: Merge "Switch from core to core-libart"
* commit 'f8077cf2d7ee55dbf02ec0c65a05db7e5c2fabfc':
Switch from core to core-libart
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 cb68340..258d9b3 100644 --- a/tools/layoutlib/Android.mk +++ b/tools/layoutlib/Android.mk @@ -28,8 +28,8 @@ include $(CLEAR_VARS) built_framework_dep := $(call java-lib-deps,framework-base) built_framework_classes := $(call java-lib-files,framework-base) -built_core_dep := $(call java-lib-deps,core) -built_core_classes := $(call java-lib-files,core) +built_core_dep := $(call java-lib-deps,core-libart) +built_core_classes := $(call java-lib-files,core-libart) built_ext_dep := $(call java-lib-deps,ext) built_ext_classes := $(call java-lib-files,ext) |