summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorHyunyoung Song <hyunyoungs@google.com>2015-07-20 22:37:27 (GMT)
committerHyunyoung Song <hyunyoungs@google.com>2015-07-20 22:37:27 (GMT)
commit13ef17a37e683b8ad5800e9f542b411180fbec2f (patch)
tree96beaf07307486f6491f022da63ebe381765d1a8 /Android.mk
parente5ec4ac409eb3d3169bb9350dfda51ae7e08291e (diff)
parente3fe3f89ee956e8d7995c569948cb70765ec19b8 (diff)
downloadandroid_packages_apps_Trebuchet-13ef17a37e683b8ad5800e9f542b411180fbec2f.zip
android_packages_apps_Trebuchet-13ef17a37e683b8ad5800e9f542b411180fbec2f.tar.gz
android_packages_apps_Trebuchet-13ef17a37e683b8ad5800e9f542b411180fbec2f.tar.bz2
merged ub-launcher3-burnaby, and resolved conflicts
Note1: Verified that following succeeds. $ make -j 32 dist checkbuild Note2: Verified that the git history of burnaby is (998 commit) is pulled into mnc-dev packages/apps/Launcher3 git project using gitk. b/22609402 Change-Id: If20ed77328a71d05a590a7ee2e84d5472d0248ae
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk15
1 files changed, 6 insertions, 9 deletions
diff --git a/Android.mk b/Android.mk
index 2a406e7..134cfb5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -23,28 +23,23 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
-
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_SDK_VERSION := current
LOCAL_PACKAGE_NAME := Launcher3
#LOCAL_CERTIFICATE := shared
LOCAL_OVERRIDES_PACKAGES := Home Launcher2
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
include $(BUILD_PACKAGE)
@@ -83,4 +78,6 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/util/etc/launcher_protoutil | $(ACP)
$(copy-file-to-new-target)
$(hide) chmod 755 $@
+INTERNAL_DALVIK_MODULES += $(LOCAL_INSTALLED_MODULE)
+
include $(call all-makefiles-under,$(LOCAL_PATH))