From 4a6c2c5586fd4cb1c945b8c34bb9c9b36490d81a Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Tue, 7 Jul 2015 11:40:31 -0700 Subject: Updating makefile to use the current SDK Change-Id: I9e0f3f6d329098b40b704be6f60200110be5ed0e --- Android.mk | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/Android.mk b/Android.mk index d7bfdd464..2e574783d 100644 --- a/Android.mk +++ b/Android.mk @@ -23,31 +23,21 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := optional -LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 - LOCAL_SRC_FILES := $(call all-java-files-under, src) \ $(call all-java-files-under, WallpaperPicker/src) \ - $(call all-renderscript-files-under, src) \ $(call all-proto-files-under, protos) LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/WallpaperPicker/res $(LOCAL_PATH)/res - -LOCAL_AAPT_FLAGS := --auto-add-overlay +LOCAL_PROGUARD_FLAG_FILES := proguard.flags +LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 android-support-v7-recyclerview LOCAL_PROTOC_OPTIMIZE_TYPE := nano LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/ +LOCAL_AAPT_FLAGS := --auto-add-overlay -LOCAL_SDK_VERSION := 21 -LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-v4 \ - android-support-v7-recyclerview - +LOCAL_SDK_VERSION := current LOCAL_PACKAGE_NAME := Launcher3 -#LOCAL_CERTIFICATE := shared - LOCAL_OVERRIDES_PACKAGES := Launcher2 -LOCAL_PROGUARD_FLAG_FILES := proguard.flags - include $(BUILD_PACKAGE) # -- cgit v1.2.3