summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Tang <jimtang@google.com>2024-04-22 23:56:52 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-04-22 23:56:52 +0000
commit2ac770b97640d15f53fe6d7aeacec8f88f83a362 (patch)
treef868e6008e538fbd8308015694431c3f547d5356
parent5a25f6a5edc6ffc1f381e5897eb3ee2ff3306173 (diff)
parent2c1d9f9640d44bc37e518085b44cdd59a7fc3c6f (diff)
downloadsdk-2ac770b97640d15f53fe6d7aeacec8f88f83a362.tar.gz
Merge "Remove deprecate jack-jacoco-reporter" into main
-rw-r--r--Android.mk19
-rw-r--r--tools/Android.mk38
-rw-r--r--tools/jack-jacoco-reporter.jarbin1954445 -> 0 bytes
3 files changed, 0 insertions, 57 deletions
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 9073ac3a2..000000000
--- a/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2010 The Android Open Source 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tools/Android.mk b/tools/Android.mk
deleted file mode 100644
index 743663d73..000000000
--- a/tools/Android.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Copyright (C) 2010 The Android Open Source 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.
-#
-
-LOCAL_PATH:= $(call my-dir)
-
-##################################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := jack-jacoco-reporter
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-CPL-1.0 SPDX-license-identifier-MIT SPDX-license-identifier-Unicode-DFS SPDX-license-identifier-W3C
-LOCAL_LICENSE_CONDITIONS := notice reciprocal
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE
-LOCAL_SRC_FILES := jack-jacoco-reporter.jar
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-MOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
-LOCAL_BUILT_MODULE_STEM := jack-jacoco-reporter$(COMMON_JAVA_PACKAGE_SUFFIX)
-LOCAL_IS_HOST_MODULE := true
-
-include $(BUILD_PREBUILT)
-
-# Distribute the reporter tool for coverage builds
-ifeq (true,$(EMMA_INSTRUMENT))
-$(call dist-for-goals, dist_files, $(LOCAL_BUILT_MODULE))
-endif # EMMA_INSTRUMENT
diff --git a/tools/jack-jacoco-reporter.jar b/tools/jack-jacoco-reporter.jar
deleted file mode 100644
index fdc2cf4eb..000000000
--- a/tools/jack-jacoco-reporter.jar
+++ /dev/null
Binary files differ