diff options
| author | Raman Tenneti <rtenneti@google.com> | 2019-08-16 15:31:32 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-16 15:31:32 -0700 |
| commit | 4913236eccc749478218f8f54b03dc2199f08ff6 (patch) | |
| tree | 2405f10e9e230109eb88b53d14e5d4446524fc88 | |
| parent | 099be6c3d23ab8c6dfc9958fc20ad5226cfde6fe (diff) | |
| parent | d46b40642164b373a196b126518539eabfccd31a (diff) | |
| download | Calendar-4913236eccc749478218f8f54b03dc2199f08ff6.tar.gz | |
Merge "AOSP/Calendar - Deleted TEST_MAPPING file and LOCAL_COMPATIBILITY_SUITE to fix bug 138793948." am: e3549513e8 am: 47c095c18b am: df66205c69 am: e637bf08e8
am: d46b406421
Change-Id: Icee7d5e38fa0c5b542c145418c6447703c645980
| -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) |