summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Android.mk1
-rw-r--r--oatdump/Android.bp5
-rw-r--r--oatdump/Android.mk20
3 files changed, 5 insertions, 21 deletions
diff --git a/Android.mk b/Android.mk
index 46d2374616..e99ea575dc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -111,7 +111,6 @@ ifeq (true,$(my_art_module_source_build))
########################################################################
# product rules
-include $(art_path)/oatdump/Android.mk
include $(art_path)/tools/ahat/Android.mk
include $(art_path)/tools/dexfuzz/Android.mk
diff --git a/oatdump/Android.bp b/oatdump/Android.bp
index 9c749a6d25..8af36806c2 100644
--- a/oatdump/Android.bp
+++ b/oatdump/Android.bp
@@ -239,3 +239,8 @@ art_cc_test {
data: [":generate-boot-image"],
test_config: "art_standalone_oatdump_tests.xml",
}
+
+phony_rule {
+ name: "dump-oat",
+ phony_deps: ["dump-oat-boot"],
+}
diff --git a/oatdump/Android.mk b/oatdump/Android.mk
deleted file mode 100644
index e5375ebb60..0000000000
--- a/oatdump/Android.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Copyright (C) 2011 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)
-
-.PHONY: dump-oat
-dump-oat: dump-oat-boot