Merge remote-tracking branch 'cm/cm-13.0' into cm-13.0-x86

[android-x86/packages-apps-Trebuchet.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index 3a6442a..50741cb 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -25,10 +25,12 @@ LOCAL_MODULE_TAGS := optional
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
     android-support-v4 \
-    android-support-v7-recyclerview
+    android-support-v7-recyclerview \
+    org.cyanogenmod.platform.internal
+
+LOCAL_STATIC_JAVA_AAR_LIBRARIES := ambientsdk
 
 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 \
@@ -41,17 +43,39 @@ 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.cyanogen.ambient
 
-LOCAL_SDK_VERSION := current
-LOCAL_PACKAGE_NAME := Launcher3
+#LOCAL_SDK_VERSION := current
+LOCAL_PACKAGE_NAME := Trebuchet
 LOCAL_PRIVILEGED_MODULE := true
-#LOCAL_CERTIFICATE := shared
 
-LOCAL_OVERRIDES_PACKAGES := Home Launcher2
+# Sign the package when not using test-keys
+ifneq ($(DEFAULT_SYSTEM_DEV_CERTIFICATE),build/target/product/security/testkey)
+LOCAL_CERTIFICATE := cyngn-app
+endif
+
+LOCAL_AAPT_FLAGS += --rename-manifest-package com.cyanogenmod.trebuchet
+
+LOCAL_OVERRIDES_PACKAGES := Launcher3
+LOCAL_REQUIRED_MODULES := AnalyticsService HardwareCollector
+
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+LOCAL_PROGUARD_ENABLED := full
+
+REMOTE_FOLDER_UPDATER ?= $(LOCAL_PATH)/RemoteFolder
+include $(REMOTE_FOLDER_UPDATER)/Android.mk
 
 include $(BUILD_PACKAGE)
 
+include $(CLEAR_VARS)
+
+REMOTE_FOLDER_UPDATER ?= $(LOCAL_PATH)/RemoteFolder
+include $(REMOTE_FOLDER_UPDATER)/Android-prebuilt-libs.mk
+
+include $(BUILD_MULTI_PREBUILT)
+
+include $(CLEAR_VARS)
 
 #
 # Protocol Buffer Debug Utility in Java
@@ -71,6 +95,7 @@ LOCAL_JAR_MANIFEST := util/etc/manifest.txt
 
 include $(BUILD_HOST_JAVA_LIBRARY)
 
+
 #
 # Protocol Buffer Debug Utility Wrapper Script
 #