Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8152502e authored by Deepanshu Gupta's avatar Deepanshu Gupta Committed by Android Git Automerger
Browse files

am 07d5f94e: am 2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT... 

am 07d5f94e: am 2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev

* commit '07d5f94e':
  Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
parents 29b4986e 07d5f94e

tools/layoutlib/Android.mk

+6 −1
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ built_framework_classes := $(call java-lib-files,framework) 
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)

tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java

+1 −0
Original line number Diff line number Diff line
@@ -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();