diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2016-02-18 15:09:21 -0800 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2016-02-18 15:09:21 -0800 |
| commit | bd822508e57fd379556ea318b16959c7e48a335b (patch) | |
| tree | e38d13a3a29f77c424b8efb33104b5dbed3681c4 /Android.mk | |
| parent | ecd365293fedf8b78cf1e8df0b9d93968c9910ba (diff) | |
| download | android_packages_apps_Trebuchet-bd822508e57fd379556ea318b16959c7e48a335b.tar.gz android_packages_apps_Trebuchet-bd822508e57fd379556ea318b16959c7e48a335b.tar.bz2 android_packages_apps_Trebuchet-bd822508e57fd379556ea318b16959c7e48a335b.zip | |
Deleting the WallpaperPicker code inside launcher.
Instead linking it to the packages/apps/WallpaperPicker project
Change-Id: Ib6830b180a22c22afece01e0a4f6e94e89d6452b
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk index 1dde46bef..077386989 100644 --- a/Android.mk +++ b/Android.mk @@ -24,14 +24,14 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := optional LOCAL_STATIC_JAVA_LIBRARIES := \ + libWallpaperPicker \ android-support-v4 \ android-support-v7-recyclerview LOCAL_SRC_FILES := $(call all-java-files-under, src) \ - $(call all-java-files-under, WallpaperPicker/src) \ $(call all-proto-files-under, protos) -LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/WallpaperPicker/res \ +LOCAL_RESOURCE_DIR := packages/apps/WallpaperPicker/res \ $(LOCAL_PATH)/res \ prebuilts/sdk/current/support/v7/recyclerview/res @@ -41,7 +41,8 @@ LOCAL_PROTOC_OPTIMIZE_TYPE := nano LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/ LOCAL_AAPT_FLAGS := \ --auto-add-overlay \ - --extra-packages android.support.v7.recyclerview + --extra-packages android.support.v7.recyclerview \ + --extra-packages com.android.wallpaperpicker LOCAL_SDK_VERSION := current LOCAL_PACKAGE_NAME := Launcher3 |