From 70b1937340c2c48acfd74def2d92f072e939b4c4 Mon Sep 17 00:00:00 2001
From: Roman Birg <roman@cyngn.com>
Date: Mon, 2 May 2016 11:03:08 -0700
Subject: Trebuchet: send metrics directly when possible

Use the SDK directly instead of relying on an external package.

Still relies on C-Apps Core to send.

Reverts the revert and fixes the issue (missing aapt flag overlay)
This reverts commit d20f7796e45dcae0e619d3bb76a3a89674705702.

Ticket: CYNGNOS-2545
Change-Id: I9445cadc429c3158cabb6a7d07e016f6fe3dac19
(cherry picked from commit 90106d85b75a60a8bdc9c4ad891e4a2e7ce548dd)
---
 Android.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'Android.mk')

diff --git a/Android.mk b/Android.mk
index 5ef85b480..3b21fb936 100644
--- a/Android.mk
+++ b/Android.mk
@@ -28,6 +28,7 @@ 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-java-files-under, WallpaperPicker/src) \
@@ -43,7 +44,8 @@ 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 := Trebuchet
-- 
cgit v1.2.3