From ee62781b8d80b4426f70d85724255181f8d35f61 Mon Sep 17 00:00:00 2001 From: Steve Kondik Date: Sun, 13 Nov 2016 23:54:50 -0800 Subject: snap: Clean up Makefile Change-Id: Ib4e3f55b8333f52340f78b99d670c930519675d1 --- Android.mk | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/Android.mk b/Android.mk index 58772ca94..bfc0dd91e 100644 --- a/Android.mk +++ b/Android.mk @@ -4,23 +4,26 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := optional -LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13 -LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4 -LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit -LOCAL_STATIC_JAVA_LIBRARIES += glide +LOCAL_STATIC_JAVA_LIBRARIES := \ + android-support-v13 \ + android-support-v4 \ + glide \ + xmp_toolkit -LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_SRC_FILES += $(call all-java-files-under, src_pd) -LOCAL_SRC_FILES += $(call all-java-files-under, src_pd_gcam) -LOCAL_SRC_FILES += $(call all-renderscript-files-under, rs) +LOCAL_SRC_FILES := \ + $(call all-java-files-under, src) \ + $(call all-java-files-under, src_pd) \ + $(call all-java-files-under, src_pd_gcam) \ + $(call all-renderscript-files-under, rs) \ -LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res +LOCAL_RESOURCE_DIR := \ + $(LOCAL_PATH)/res include $(LOCAL_PATH)/version.mk LOCAL_AAPT_FLAGS := \ - --auto-add-overlay \ - --version-name "$(version_name_package)" \ - --version-code $(version_code_package) \ + --auto-add-overlay \ + --version-name "$(version_name_package)" \ + --version-code $(version_code_package) \ LOCAL_PACKAGE_NAME := Snap LOCAL_PRIVILEGED_MODULE := true -- cgit v1.2.3