From 359bab54b06a0c3edf90916417ed994b163d5c60 Mon Sep 17 00:00:00 2001 From: Sasha Smundak Date: Fri, 4 Jan 2019 17:19:47 -0800 Subject: Convert Android.mk to Android.bp. See build/soong/README.md for more information Change-Id: I7fd844f966e73deffff3eb355ac06f0afc519b78 Fixes: 122331935 Test: treehugger --- Android.bp | 19 +++++++++++++++++++ Android.mk | 24 ------------------------ 2 files changed, 19 insertions(+), 24 deletions(-) create mode 100644 Android.bp delete mode 100644 Android.mk diff --git a/Android.bp b/Android.bp new file mode 100644 index 00000000..13963205 --- /dev/null +++ b/Android.bp @@ -0,0 +1,19 @@ +android_library { + name: "glide", + srcs: [ + "library/src/**/*.java", + "third_party/disklrucache/src/**/*.java", + "third_party/gif_decoder/src/**/*.java", + "third_party/gif_encoder/src/**/*.java", + ], + manifest: "library/src/main/AndroidManifest.xml", + libs: [ + "android-support-core-ui", + "android-support-compat", + "volley", + ], + static_libs: [ + "android-support-fragment", + ], + sdk_version: "current", +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index d71ae327..00000000 --- a/Android.mk +++ /dev/null @@ -1,24 +0,0 @@ -LOCAL_PATH := $(my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(call all-java-files-under, library/src) -LOCAL_SRC_FILES += $(call all-java-files-under, third_party/disklrucache/src) -LOCAL_SRC_FILES += $(call all-java-files-under, third_party/gif_decoder/src) -LOCAL_SRC_FILES += $(call all-java-files-under, third_party/gif_encoder/src) -LOCAL_MANIFEST_FILE := library/src/main/AndroidManifest.xml - -LOCAL_JAVA_LIBRARIES := volley - -LOCAL_SHARED_ANDROID_LIBRARIES := \ - android-support-fragment \ - android-support-core-ui \ - android-support-compat - -LOCAL_MODULE := glide -LOCAL_MODULE_TAGS := optional -LOCAL_USE_AAPT2 := true -LOCAL_SDK_VERSION := current - -include $(BUILD_STATIC_JAVA_LIBRARY) - -include $(CLEAR_VARS) -- cgit v1.2.3