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 41130af..50741cb 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -23,30 +23,59 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    android-support-v4 \
+    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-renderscript-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
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/WallpaperPicker/res \
+    $(LOCAL_PATH)/res \
+    $(LOCAL_PATH)/../../../prebuilts/sdk/current/support/v7/recyclerview/res
+
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
 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 com.cyanogen.ambient
 
-LOCAL_SDK_VERSION := 21
+#LOCAL_SDK_VERSION := current
+LOCAL_PACKAGE_NAME := Trebuchet
+LOCAL_PRIVILEGED_MODULE := true
 
-LOCAL_PACKAGE_NAME := Launcher3
-#LOCAL_CERTIFICATE := shared
+# Sign the package when not using test-keys
+ifneq ($(DEFAULT_SYSTEM_DEV_CERTIFICATE),build/target/product/security/testkey)
+LOCAL_CERTIFICATE := cyngn-app
+endif
 
-LOCAL_OVERRIDES_PACKAGES := Launcher2
+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
@@ -66,6 +95,7 @@ LOCAL_JAR_MANIFEST := util/etc/manifest.txt
 
 include $(BUILD_HOST_JAVA_LIBRARY)
 
+
 #
 # Protocol Buffer Debug Utility Wrapper Script
 #
@@ -83,4 +113,6 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/util/etc/launcher_protoutil | $(ACP)
        $(copy-file-to-new-target)
        $(hide) chmod 755 $@
 
+INTERNAL_DALVIK_MODULES += $(LOCAL_INSTALLED_MODULE)
+
 include $(call all-makefiles-under,$(LOCAL_PATH))