Merge "Build SlimFileManager" into jb4.2
diff --git a/config/common.mk b/config/common.mk
index 217a163..48b1820 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -142,7 +142,7 @@
# Extra Optional packages
PRODUCT_PACKAGES += \
HoloLauncherHD \
- FileManager \
+ SlimFileManager \
Velvet \
LatinIME
diff --git a/proprietary/filemanager/Android.mk b/proprietary/filemanager/Android.mk
deleted file mode 100644
index 7d7d6de..0000000
--- a/proprietary/filemanager/Android.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE :=FileManager
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_CERTIFICATE := PRESIGNED
-include $(BUILD_PREBUILT)
diff --git a/proprietary/filemanager/FileManager.apk b/proprietary/filemanager/FileManager.apk
deleted file mode 100755
index 6b618ae..0000000
--- a/proprietary/filemanager/FileManager.apk
+++ /dev/null
Binary files differ