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

Commit 9570ed56 authored by Deepanshu Gupta's avatar Deepanshu Gupta Committed by Android (Google) Code Review
Browse files

Merge "Add libphonenumber to layoutlib.jar. DO NOT MERGE" into klp-dev

parents 599105a9 1f92d7fc

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-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)

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();