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

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

diff --git a/Android.mk b/Android.mk
index 38edafa..c6df4cc 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -28,8 +28,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
     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-proto-files-under, protos)
 
@@ -43,21 +41,17 @@ 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
+    --extra-packages android.support.v7.recyclerview
 
 #LOCAL_SDK_VERSION := current
 LOCAL_PACKAGE_NAME := Trebuchet
 LOCAL_PRIVILEGED_MODULE := true
-
-# Sign the package when not using test-keys
-ifneq ($(DEFAULT_SYSTEM_DEV_CERTIFICATE),build/target/product/security/testkey)
-LOCAL_CERTIFICATE := cyngn-app
-endif
+LOCAL_CERTIFICATE := platform
 
 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