diff options
| author | 2017-02-14 19:28:36 +0000 | |
|---|---|---|
| committer | 2017-02-14 19:28:36 +0000 | |
| commit | 4114a9597ac87b16bc1262c530ffcaa9547cd97f (patch) | |
| tree | f16944efa3cbedc996338b0f8c7c56924a7d2183 | |
| parent | 710a285110c9fbe4296a7afc9b2923d66f00806b (diff) | |
| parent | 886d642fb630e3e3b5f8f61c845ac0e2a3cb45d9 (diff) | |
Merge "Use asm-5.2 prebuilt" am: 6b32770d6d am: 6c1ac4dd80 am: 29fd14f9ee
am: 886d642fb6
Change-Id: I1c8d74fc0967521a9a52fdc5cac0f1216d6bff5c
| -rw-r--r-- | tools/layoutlib/create/Android.mk | 2 | ||||
| -rw-r--r-- | tools/layoutlib/create/tests/Android.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/layoutlib/create/Android.mk b/tools/layoutlib/create/Android.mk index c7f2c4137687..7611cde3f392 100644 --- a/tools/layoutlib/create/Android.mk +++ b/tools/layoutlib/create/Android.mk @@ -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 diff --git a/tools/layoutlib/create/tests/Android.mk b/tools/layoutlib/create/tests/Android.mk index 61e381d48b16..488d7d6cc18d 100644 --- a/tools/layoutlib/create/tests/Android.mk +++ b/tools/layoutlib/create/tests/Android.mk @@ -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) |