diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2013-11-18 10:15:44 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-18 10:15:44 -0800 |
| commit | 5b95025059f0925ad8d11bf503eb2acb4cc63228 (patch) | |
| tree | 12a7753bebedcedbc65b6557a93faf32b08c7eca | |
| parent | f6ee0805706531ee0e899778a16bec71b5f18ce5 (diff) | |
| parent | ea04da7a183b526cdc79366822e4fc794d28cbd2 (diff) | |
| download | frameworks_base-5b95025059f0925ad8d11bf503eb2acb4cc63228.zip frameworks_base-5b95025059f0925ad8d11bf503eb2acb4cc63228.tar.gz frameworks_base-5b95025059f0925ad8d11bf503eb2acb4cc63228.tar.bz2 | |
am ea04da7a: am 9570ed56: Merge "Add libphonenumber to layoutlib.jar. DO NOT MERGE" into klp-dev
* commit 'ea04da7a183b526cdc79366822e4fc794d28cbd2':
Add libphonenumber to layoutlib.jar. DO NOT MERGE
| -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 4e73568..ed497a5 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 ba23048..ee501d2 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(); |