commit e3549513e8874e294082a4db56b9fac5c78d2ad6
author Treehugger Robot <treehugger-gerrit@google.com> Fri Aug 16 21:21:25 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 16 21:21:25 2019 +0000
tree e35d6752c8fc4af8174bf049ff57ad7523289eef
parent 147e6a9613fab326f3bf0a87df49488a4a79aaa1
parent 61f391a7b82a616861758a652810fcffc43507f2

Merge "AOSP/Calendar - Deleted TEST_MAPPING file and LOCAL_COMPATIBILITY_SUITE to fix bug 138793948."

Android.mk

diff --git a/Android.mk b/Android.mk
index 27886ca..5cfdc85 100644
--- a/Android.mk
+++ b/Android.mk
@@ -35,8 +35,6 @@
 
 LOCAL_PACKAGE_NAME := Calendar
 
-LOCAL_COMPATIBILITY_SUITE := general-tests
-
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
 LOCAL_PRODUCT_MODULE := true

TEST_MAPPING

diff --git a/TEST_MAPPING b/TEST_MAPPING
deleted file mode 100644
index 31049a6..0000000
--- a/TEST_MAPPING
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "presubmit": [
-    {
-      "name": "CalendarTests"
-    }
-  ]
-}

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index 253b813..bacb8c0 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -19,6 +19,4 @@
 LOCAL_STATIC_JAVA_LIBRARIES := android-common
 LOCAL_SDK_VERSION := 16
 
-LOCAL_COMPATIBILITY_SUITE := general-tests
-
 include $(BUILD_PACKAGE)