diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2013-11-18 18:08:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-18 18:08:09 +0000 |
| commit | 9570ed561296dd5a0753198706cde152b00f1b24 (patch) | |
| tree | 54ffad78e40ca85c417654a68c2cb34a3220696b | |
| parent | 599105a92ceb24f0f09beb11be18126ae4e8efdf (diff) | |
| parent | 1f92d7fc0ffa72d7db93244c29a1a6575bb4b318 (diff) | |
| download | base-9570ed561296dd5a0753198706cde152b00f1b24.tar.gz | |
Merge "Add libphonenumber to layoutlib.jar. DO NOT MERGE" into klp-dev
| -rw-r--r-- | tools/layoutlib/Android.mk | 7 | ||||
| -rw-r--r-- | tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/tools/layoutlib/Android.mk b/tools/layoutlib/Android.mk index 4e735686d4fd..ed497a5c0f34 100644 --- a/tools/layoutlib/Android.mk +++ b/tools/layoutlib/Android.mk @@ -31,6 +31,9 @@ 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_ext_dep := $(call java-lib-deps,ext) +built_ext_classes := $(call java-lib-files,ext) + built_layoutlib_create_jar := $(call intermediates-dir-for, \ JAVA_LIBRARIES,layoutlib_create,HOST)/javalib.jar @@ -47,6 +50,7 @@ include $(BUILD_SYSTEM)/base_rules.mk $(LOCAL_BUILT_MODULE): $(built_core_dep) \ $(built_framework_dep) \ + $(built_ext_dep) \ $(built_layoutlib_create_jar) $(hide) echo "host layoutlib_create: $@" $(hide) mkdir -p $(dir $@) @@ -55,7 +59,8 @@ $(LOCAL_BUILT_MODULE): $(built_core_dep) \ $(hide) java -jar $(built_layoutlib_create_jar) \ $@ \ $(built_core_classes) \ - $(built_framework_classes) + $(built_framework_classes) \ + $(built_ext_classes) $(hide) ls -l $(built_framework_classes) diff --git a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java index ba23048aee7b..ee501d234d01 100644 --- a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java +++ b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java @@ -113,6 +113,7 @@ public class Main { "android.pim.*", // for datepicker "android.os.*", // for android.os.Handler "android.database.ContentObserver", // for Digital clock + "com.android.i18n.phonenumbers.*", // for TextView with autolink attribute }, excludeClasses); aa.analyze(); |