diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-08-16 21:21:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-08-16 21:21:25 +0000 |
| commit | e3549513e8874e294082a4db56b9fac5c78d2ad6 (patch) | |
| tree | e35d6752c8fc4af8174bf049ff57ad7523289eef | |
| parent | 147e6a9613fab326f3bf0a87df49488a4a79aaa1 (diff) | |
| parent | 61f391a7b82a616861758a652810fcffc43507f2 (diff) | |
| download | Calendar-e3549513e8874e294082a4db56b9fac5c78d2ad6.tar.gz | |
Merge "AOSP/Calendar - Deleted TEST_MAPPING file and LOCAL_COMPATIBILITY_SUITE to fix bug 138793948."
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | TEST_MAPPING | 7 | ||||
| -rw-r--r-- | tests/Android.mk | 2 |
3 files changed, 0 insertions, 11 deletions
@@ -35,8 +35,6 @@ LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) LOCAL_PACKAGE_NAME := Calendar -LOCAL_COMPATIBILITY_SUITE := general-tests - LOCAL_PROGUARD_FLAG_FILES := proguard.flags LOCAL_PRODUCT_MODULE := true diff --git a/TEST_MAPPING b/TEST_MAPPING deleted file mode 100644 index 31049a6f..00000000 --- a/TEST_MAPPING +++ /dev/null @@ -1,7 +0,0 @@ -{ - "presubmit": [ - { - "name": "CalendarTests" - } - ] -} diff --git a/tests/Android.mk b/tests/Android.mk index 253b813d..bacb8c04 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -19,6 +19,4 @@ LOCAL_INSTRUMENTATION_FOR := Calendar LOCAL_STATIC_JAVA_LIBRARIES := android-common LOCAL_SDK_VERSION := 16 -LOCAL_COMPATIBILITY_SUITE := general-tests - include $(BUILD_PACKAGE) |