diff options
| author | Artem Shvadskiy <ashvadskiy@cyngn.com> | 2015-12-14 15:39:36 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2015-12-15 15:53:33 -0800 |
| commit | acf61e0834d2c0f605a3abc6fde86f0866a8b5a2 (patch) | |
| tree | 2e600a43a80b1a681bbe68dd5502cb20193e40d2 /Android.mk | |
| parent | 174345ec50101d61f9b1950d4c30afcb962de7e2 (diff) | |
| download | android_packages_apps_Trebuchet-acf61e0834d2c0f605a3abc6fde86f0866a8b5a2.tar.gz android_packages_apps_Trebuchet-acf61e0834d2c0f605a3abc6fde86f0866a8b5a2.tar.bz2 android_packages_apps_Trebuchet-acf61e0834d2c0f605a3abc6fde86f0866a8b5a2.zip | |
1. Move RemoteFolderManager and RemoteFolderUpdater into launcher3 package
and move RemoteFolderManager implementation to overlay.
2. Modify settings to hide remote folder preference on CM builds.
3. Remove remote folder from default workspace.
Change-Id: I6cc3409cf0a9ada68779c41e62f46bc08f2f9ad4
issue-id: CYNGNOS-1429
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk index 70770fc8b..04d4e4e9a 100644 --- a/Android.mk +++ b/Android.mk @@ -34,8 +34,7 @@ LOCAL_SRC_FILES := $(call all-java-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 \ - --extra-packages com.cyngn.RemoteFolder +LOCAL_AAPT_FLAGS := --auto-add-overlay LOCAL_PROTOC_OPTIMIZE_TYPE := nano LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/ @@ -59,7 +58,6 @@ include $(REMOTE_FOLDER_UPDATER)/Android.mk include $(BUILD_PACKAGE) include $(CLEAR_VARS) -include $(REMOTE_FOLDER_UPDATER)/Android.mk include $(BUILD_MULTI_PREBUILT) # |