From cf8f5cefcbeed5a81ffa80cef3ad4e35c67178ec Mon Sep 17 00:00:00 2001
From: Adnan Begovic <adnan@cyngn.com>
Date: Mon, 6 Jun 2016 16:21:56 -0700
Subject: [PATCH] CMSettingsProvider: Register as CMTS package.

Change-Id: I6733d352c47b4abbadc42222d3dd5976db8d36b6
---
 packages/CMSettingsProvider/tests/Android.mk  | 24 ++++++++-
 .../CMSettingsProvider/tests/proguard.flags   | 50 +++++++++++++++++++
 2 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 packages/CMSettingsProvider/tests/proguard.flags

diff --git a/packages/CMSettingsProvider/tests/Android.mk b/packages/CMSettingsProvider/tests/Android.mk
index 56c2466..813da15 100644
--- a/packages/CMSettingsProvider/tests/Android.mk
+++ b/packages/CMSettingsProvider/tests/Android.mk
@@ -26,9 +26,31 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
 LOCAL_CERTIFICATE := platform
 LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_PROGUARD_ENABLED := disabled
+LOCAL_PROGUARD_ENABLED := optimization shrinktests
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
     org.cyanogenmod.platform.internal
 
 include $(BUILD_PACKAGE)
+
+# Register as CMTS
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_PACKAGE_NAME := CmtsCMSettingsProviderTests
+LOCAL_INSTRUMENTATION_FOR := CMSettingsProvider
+
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+
+LOCAL_CERTIFICATE := platform
+LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_PROGUARD_ENABLED := optimization shrinktests
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    org.cyanogenmod.platform.internal
+
+include $(BUILD_CMTS_PACKAGE)
+
diff --git a/packages/CMSettingsProvider/tests/proguard.flags b/packages/CMSettingsProvider/tests/proguard.flags
new file mode 100644
index 0000000..d9e855c
--- /dev/null
+++ b/packages/CMSettingsProvider/tests/proguard.flags
@@ -0,0 +1,50 @@
+# Copyright (C) 2016 The CyanogenMod Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Don't skip non public library classes, make sure we're not keeping anything which will get mapped against api verification.
+-dontskipnonpubliclibraryclasses
+
+# Do the same with class members
+-dontskipnonpubliclibraryclassmembers
+
+# Keep test packages
+-keep class android.support.** { *; }
+-keep class android.test.** { *; }
+-keep public class * extends android.support.** { *; }
+-keep public class * extends android.test.** { *; }
+-keep interface android.support.** { *; }
+-keep interface android.test.** { *; }
+
+# Keep all junit classes
+-keep class junit.** { *; }
+-keep class org.junit.** { *; }
+-keep interface junit.** { *; }
+-keep interface org.junit.** { *; }
+
+# Keep compiled java classes from declared aidl's within the test package
+-keep public class * extends android.os.IInterface { *; }
+
+# Don't warn about the Android Support Test JUnit Runner
+-dontwarn android.support.**
+-dontwarn android.test.**
+
+# Don't warn about junit
+-dontwarn junit.**
+-dontwarn org.junit.**
+
+# Always process
+-forceprocessing
+
+# Make sure not to obfuscate the output
+-dontobfuscate