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

Commit dd24c58f authored by Neil Fuller's avatar Neil Fuller
Browse files

Change libraries needed by layoutlib to "host" libs 

They are only used on host and are one of the few places
in the build that use LOCAL_JACK_ENABLED := disabled.

Bug: 27218410
(cherry picked from commit d34e33bc)

Change-Id: I8febfca41b3e9baaf290e53ca1449254d4cc9b46
parent d21b6420

tools/layoutlib/Android.mk

+4 −6
Original line number Diff line number Diff line
@@ -40,10 +40,8 @@ built_ext_dep := $(call java-lib-deps,ext) 
built_ext_classes := $(call java-lib-files,ext)

built_ext_data := $(call intermediates-dir-for, \

			JAVA_LIBRARIES,ext,,COMMON)/javalib.jar

built_icudata_dep := $(call java-lib-deps,icu4j-icudata-jarjar)

built_icudata_data := $(call java-lib-files,icu4j-icudata-jarjar)

built_icutzdata_dep := $(call java-lib-deps,icu4j-icutzdata-jarjar)

built_icutzdata_data := $(call java-lib-files,icu4j-icutzdata-jarjar)

built_icudata_dep := $(call java-lib-deps,icu4j-icudata-host-jarjar,HOST)

built_icutzdata_dep := $(call java-lib-deps,icu4j-icutzdata-host-jarjar,HOST)



built_layoutlib_create_jar := $(call intermediates-dir-for, \

			JAVA_LIBRARIES,layoutlib_create,HOST)/javalib.jar
@@ -77,8 +75,8 @@ $(LOCAL_BUILT_MODULE): $(built_oj_dep) \ 
	             $(built_core_classes) \

	             $(built_framework_classes) \

	             $(built_ext_classes) \

		     $(built_icudata_data) \

		     $(built_icutzdata_data) \

		     $(built_icudata_dep) \

		     $(built_icutzdata_dep) \

	             $(built_ext_data)

	$(hide) ls -l $(built_framework_classes)