commit 7b0686bb1359c9ddc6c68bae1f1d59f6f35a4a06
author Jose Pascoal <jose.pascoal@kwamecorp.com> Tue Feb 03 17:07:21 2015 +0000
committer kees@fairphone.com <kees@fairphone.com> Fri Jul 10 15:22:15 2015 +0200
tree a3abaf7cd36915592202ed69f3481da605a2959c
parent f8985087499520cae151f7f0da8a02c8e4d54d6f

FP2-870: Merge upstream FairphoneLauncher3

Revert "Split FairphoneLauncher3 and WallpaperPicker into different compilaiton units"

This reverts commit 25ab4c9ce4f35d0f0a1aa629143bc1d2e1fff074.

Change-Id: If1bef2ee262f2e8b49cabf10f5bb08d736a55f00

Android.mk

diff --git a/Android.mk b/Android.mk
index 38e58b3..38f13f1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -23,12 +23,13 @@
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_STATIC_JAVA_LIBRARIES := flcrashlytics android-support-v13 libphonenumber wallpaperpicker
+LOCAL_STATIC_JAVA_LIBRARIES := flcrashlytics android-support-v13 libphonenumber
 
 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)/res
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/WallpaperPicker/res $(LOCAL_PATH)/res
 
 LOCAL_AAPT_FLAGS := --auto-add-overlay