Merge remote-tracking branch 'origin/ub-launcher3-burnaby' into mnc-dev
Conflicts:
Android.mk
Change-Id: I05429e418a25b94e7669e002d39bc70806396b8e
diff --git a/Android.mk b/Android.mk
index ec675c6..3a6442a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -45,10 +45,14 @@
LOCAL_SDK_VERSION := current
LOCAL_PACKAGE_NAME := Launcher3
+LOCAL_PRIVILEGED_MODULE := true
+#LOCAL_CERTIFICATE := shared
+
LOCAL_OVERRIDES_PACKAGES := Home Launcher2
include $(BUILD_PACKAGE)
+
#
# Protocol Buffer Debug Utility in Java
#
@@ -64,7 +68,6 @@
LOCAL_MODULE := launcher_protoutil_lib
LOCAL_IS_HOST_MODULE := true
LOCAL_JAR_MANIFEST := util/etc/manifest.txt
-LOCAL_STATIC_JAVA_LIBRARIES := host-libprotobuf-java-2.3.0-nano
include $(BUILD_HOST_JAVA_LIBRARY)
@@ -79,7 +82,7 @@
include $(BUILD_SYSTEM)/base_rules.mk
-$(LOCAL_BUILT_MODULE): launcher_protoutil_lib
+$(LOCAL_BUILT_MODULE): | $(HOST_OUT_JAVA_LIBRARIES)/launcher_protoutil_lib.jar
$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/util/etc/launcher_protoutil | $(ACP)
@echo "Copy: $(PRIVATE_MODULE) ($@)"
$(copy-file-to-new-target)
@@ -87,5 +90,4 @@
INTERNAL_DALVIK_MODULES += $(LOCAL_INSTALLED_MODULE)
-# ==================================================
include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/proguard.flags b/proguard.flags
index 5a3dfd1..d6b9ba3 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -1,7 +1,3 @@
--keep,allowshrinking,allowoptimization class com.android.launcher3.** {
- *;
-}
-
-keep class com.android.launcher3.allapps.AllAppsBackgroundDrawable {
public void setAlpha(int);
public int getAlpha();