summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Android.mk1
-rw-r--r--tools/Android.bp8
-rw-r--r--tools/Android.mk34
3 files changed, 8 insertions, 35 deletions
diff --git a/Android.mk b/Android.mk
index 3d47b1bac4..9879864cef 100644
--- a/Android.mk
+++ b/Android.mk
@@ -58,7 +58,6 @@ include $(art_path)/build/Android.cpplint.mk
# product rules
include $(art_path)/oatdump/Android.mk
-include $(art_path)/tools/Android.mk
include $(art_path)/tools/ahat/Android.mk
include $(art_path)/tools/dexfuzz/Android.mk
include $(art_path)/tools/veridex/Android.mk
diff --git a/tools/Android.bp b/tools/Android.bp
index a3614c40b0..2a8ff0a313 100644
--- a/tools/Android.bp
+++ b/tools/Android.bp
@@ -28,3 +28,11 @@ python_binary_host {
},
},
}
+
+// Copy the art shell script to the host and target's bin directory
+sh_binary {
+ name: "art-script",
+ host_supported: true,
+ src: "art",
+ filename_from_src: true,
+}
diff --git a/tools/Android.mk b/tools/Android.mk
deleted file mode 100644
index 9ecf0cd7ed..0000000000
--- a/tools/Android.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Copyright (C) 2014 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)
-
-# Copy the art shell script to the host's bin directory
-include $(CLEAR_VARS)
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_MODULE := art-script
-LOCAL_SRC_FILES := art
-LOCAL_MODULE_STEM := art
-include $(BUILD_PREBUILT)
-
-# Copy the art shell script to the target's bin directory
-include $(CLEAR_VARS)
-LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_MODULE := art-script
-LOCAL_SRC_FILES := art
-LOCAL_MODULE_STEM := art
-include $(BUILD_PREBUILT)