diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-07-07 19:16:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-07 19:16:21 +0000 |
| commit | 3288171507ae38bce261dcf94cfae08392d961c2 (patch) | |
| tree | 7280f6ea8e40a7dd2604865db3b593fd685a15cf | |
| parent | c3ab82661f02723e6c0e5c05adb8d710cd411923 (diff) | |
| parent | 4a6c2c5586fd4cb1c945b8c34bb9c9b36490d81a (diff) | |
| download | android_packages_apps_Trebuchet-3288171507ae38bce261dcf94cfae08392d961c2.tar.gz android_packages_apps_Trebuchet-3288171507ae38bce261dcf94cfae08392d961c2.tar.bz2 android_packages_apps_Trebuchet-3288171507ae38bce261dcf94cfae08392d961c2.zip | |
Merge "Updating makefile to use the current SDK" into ub-launcher3-burnaby
| -rw-r--r-- | Android.mk | 18 |
1 files 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) # |