diff options
author | Colin Cross <ccross@android.com> | 2019-03-26 13:24:35 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-03-26 13:24:35 -0700 |
commit | 40542f49b8653658998530235ccd7db51b197c83 (patch) | |
tree | f7a25f8c8df2959454ad4f2b77b2c8c2453b0250 | |
parent | 11147a32d671226cdb8e09b6b111609e1309079c (diff) | |
parent | 330944d35699a63b4b5e5e218019aa3549bc4f63 (diff) | |
download | jacoco-40542f49b8653658998530235ccd7db51b197c83.tar.gz |
Move dist of jacoco-cli into Android.bp
am: 330944d356
Change-Id: I962d700a7ca876b18825d0dd461d114b30797152
-rw-r--r-- | Android.bp | 7 | ||||
-rw-r--r-- | Android.mk | 21 |
2 files changed, 7 insertions, 21 deletions
@@ -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 |