Merge branch 'cm-13.0-oss' into HEAD

Change-Id: Ie762fdbe5b70dec6843ce489e78d802662e148fb

1 files changed, 35 insertions, 6 deletions

diff --git a/Android.mk b/Android.mk
index 7b18e38..e07a2a9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,13 +1,42 @@
-LOCAL_PATH:= $(call my-dir)
+LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_JAVA_LIBRARIES := framework
-LOCAL_STATIC_JAVA_LIBRARIES := org.cyanogenmod.platform.sdk
+LOCAL_PACKAGE_NAME	:= AudioFX
+LOCAL_MODULE_TAGS	:= optional
+
 LOCAL_OVERRIDES_PACKAGES := DSPManager
-LOCAL_PACKAGE_NAME := AudioFX
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+ifeq ($(wildcard $(LOCAL_PATH)/src_effects_priv),)
+LOCAL_SRC_FILES += $(call all-java-files-under, src_effects)
+else
+$(warning *** including private implementations of effects ***)
+LOCAL_AAPT_FLAGS += --rename-manifest-package com.cyngn.audiofx
+LOCAL_SRC_FILES += $(call all-java-files-under, src_effects_priv)
+endif
+
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 org.cyanogenmod.platform.sdk
+
+LOCAL_PROGUARD_ENABLED := disabled
+
+LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, res)
+LOCAL_AAPT_FLAGS := --auto-add-overlay
+LOCAL_AAPT_FLAGS += --extra-packages com.cyanogen.ambient
+
+LOCAL_STATIC_JAVA_AAR_LIBRARIES := ambientsdk
+
 LOCAL_PRIVILEGED_MODULE := true
 LOCAL_CERTIFICATE := platform
 
+# Sign the package when not using test-keys
+ifneq ($(DEFAULT_SYSTEM_DEV_CERTIFICATE),build/target/product/security/testkey)
+LOCAL_CERTIFICATE := cyngn-app
+endif
+
 include $(BUILD_PACKAGE)
+
+# Use the following include to make our test apk.
+ifeq (,$(ONE_SHOT_MAKEFILE))
+include $(call all-makefiles-under,$(LOCAL_PATH))
+endif