Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 84e7a6b8: am 443372dd: am 9d7b5165: Add libphonenumber to layoutlib.jar. [DO NOT MERGE]

Browse Source 
* commit '84e7a6b82303b52c7b44f1a2a295177361edf9ea':
  Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
This commit is contained in:
Deepanshu Gupta
2014-05-02 19:31:36 +00:00
committed by Android Git Automerger
parent 88a12f5744 84e7a6b823
commit 95fd97aa82
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/layoutlib/Android.mk
View File

@@ -31,6 +31,9 @@ built_framework_classes := $(call java-lib-files,framework)
built_core_dep := $(call java-lib-deps,core) built_core_dep := $(call java-lib-deps,core)
built_core_classes := $(call java-lib-files,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, \ built_layoutlib_create_jar := $(call intermediates-dir-for, \
JAVA_LIBRARIES,layoutlib_create,HOST)/javalib.jar JAVA_LIBRARIES,layoutlib_create,HOST)/javalib.jar
@@ -47,6 +50,7 @@ include $(BUILD_SYSTEM)/base_rules.mk
$(LOCAL_BUILT_MODULE): $(built_core_dep) \ $(LOCAL_BUILT_MODULE): $(built_core_dep) \
$(built_framework_dep) \ $(built_framework_dep) \
$(built_ext_dep) \
$(built_layoutlib_create_jar) $(built_layoutlib_create_jar)
$(hide) echo "host layoutlib_create: $@" $(hide) echo "host layoutlib_create: $@"
$(hide) mkdir -p $(dir $@) $(hide) mkdir -p $(dir $@)
@@ -55,7 +59,8 @@ $(LOCAL_BUILT_MODULE): $(built_core_dep) \
$(hide) java -jar $(built_layoutlib_create_jar) \ $(hide) java -jar $(built_layoutlib_create_jar) \
$@ \ $@ \
$(built_core_classes) \ $(built_core_classes) \
$(built_framework_classes) $(built_framework_classes) \
$(built_ext_classes)
$(hide) ls -l $(built_framework_classes) $(hide) ls -l $(built_framework_classes)

1
tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java
View File

@@ -113,6 +113,7 @@ public class Main {
"android.pim.*", // for datepicker "android.pim.*", // for datepicker
"android.os.*", // for android.os.Handler "android.os.*", // for android.os.Handler
"android.database.ContentObserver", // for Digital clock "android.database.ContentObserver", // for Digital clock
"com.android.i18n.phonenumbers.*", // for TextView with autolink attribute
}, },
excludeClasses); excludeClasses);
aa.analyze(); aa.analyze();