Move dist of jacoco-cli into Android.bpandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-o-mr1-iot-release-1.0.12oreo-mr1-iot-release

Fixes: 122332887
Test: treehugger
Change-Id: I594e7874a485b206a955a61472a4c99c39c7656f

2 files changed, 7 insertions, 21 deletions

diff --git a/Android.bp b/Android.bp
index 6a777643..396f2db7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -97,4 +97,11 @@ java_library_host {
         "asm-tree-6.0",
         "args4j-2.0.28",
     ],
+
+    dist: {
+        targets: [
+            "dist_files",
+            "apps_only",
+        ],
+    },
 }
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index a00938bb..00000000
--- a/Android.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Copyright (C) 2016 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 jacoco-cli in the dist directory to enable running it to generate a code-coverage report
-ifeq ($(EMMA_INSTRUMENT),true)
-$(call dist-for-goals, dist_files apps_only, $(HOST_OUT_JAVA_LIBRARIES)/jacoco-cli.jar)
-endif