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

Commit 29fd14f9 authored Feb 14, 2017 by Colin Cross Committed by android-build-merger Feb 14, 2017

Merge "Use asm-5.2 prebuilt" am: 6b32770d

am: 6c1ac4dd

Change-Id: Icc01bcd92c5b23198bb39ff382610c72b4bf1867

parents 4105747e 6c1ac4dd

tools/layoutlib/create/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under,src)

		LOCAL_JAR_MANIFEST := manifest.txt
		LOCAL_STATIC_JAVA_LIBRARIES := \
		asm-5.0
		asm-5.2

		LOCAL_MODULE := layoutlib_create

tools/layoutlib/create/tests/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ LOCAL_MODULE := layoutlib-create-tests
		LOCAL_MODULE_TAGS := optional

		LOCAL_JAVA_LIBRARIES := layoutlib_create junit-host
		LOCAL_STATIC_JAVA_LIBRARIES := asm-5.0
		LOCAL_STATIC_JAVA_LIBRARIES := asm-5.2

		include $(BUILD_HOST_JAVA_LIBRARY)