diff options
| author | Michael Bestas <mikeioannina@gmail.com> | 2015-11-28 17:42:39 +0200 |
|---|---|---|
| committer | Tyson Miller <tmiller@cyngn.com> | 2015-12-02 11:57:04 -0800 |
| commit | d69f636f145d8ff2b49348d179cfa0bbb8d4f83b (patch) | |
| tree | c51f177c619b1f038e7c4a78cf751f2f4b7cd3d1 /Android.mk | |
| parent | 719deb83a0ac84422b68605f4d5c782865766aef (diff) | |
| download | android_packages_apps_Trebuchet-d69f636f145d8ff2b49348d179cfa0bbb8d4f83b.tar.gz android_packages_apps_Trebuchet-d69f636f145d8ff2b49348d179cfa0bbb8d4f83b.tar.bz2 android_packages_apps_Trebuchet-d69f636f145d8ff2b49348d179cfa0bbb8d4f83b.zip | |
Trebuchet: RemoteFolder fix subtype & manifest entries
Change-Id: I21282fb06be4391cf5ffbfb9b60a840820ded3e9
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/Android.mk b/Android.mk index f93af5b89..70770fc8b 100644 --- a/Android.mk +++ b/Android.mk @@ -27,15 +27,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13 \ android-support-v7-recyclerview \ guava -<<<<<<< HEAD -REMOTE_FOLDER_UPDATER ?= $(LOCAL_PATH)/RemoteFolder - LOCAL_SRC_FILES := $(call all-java-files-under, src) \ - $(call all-java-files-under, $(REMOTE_FOLDER_UPDATER)/src) \ -======= -LOCAL_SRC_FILES := $(call all-java-files-under, src) \ ->>>>>>> 861f6e8... Trebuchet: Remote Folder hooks setup. Updater call still needs to be moved from Folder to LauncherModel $(call all-java-files-under, WallpaperPicker/src) \ $(call all-renderscript-files-under, src) \ $(call all-proto-files-under, protos) @@ -105,9 +98,4 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/util/etc/launcher_protoutil | $(ACP) $(copy-file-to-new-target) $(hide) chmod 755 $@ -<<<<<<< HEAD -include $(REMOTE_FOLDER_UPDATER)/Android.mk - -======= ->>>>>>> 861f6e8... Trebuchet: Remote Folder hooks setup. Updater call still needs to be moved from Folder to LauncherModel include $(call all-makefiles-under,$(LOCAL_PATH)) |