diff options
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | compiler/Android.bp | 4 | ||||
| l--------- | compiler/generate-operator-out.py | 1 | ||||
| -rw-r--r-- | dex2oat/Android.bp | 4 | ||||
| l--------- | dex2oat/generate-operator-out.py | 1 | ||||
| -rw-r--r-- | libdexfile/Android.bp | 4 | ||||
| l--------- | libdexfile/generate-operator-out.py | 1 | ||||
| l--------- | openjdkjvmti/generate-operator-out.py | 1 | ||||
| -rw-r--r-- | runtime/Android.bp | 4 | ||||
| l--------- | runtime/generate-operator-out.py | 1 | ||||
| -rw-r--r-- | tools/Android.bp | 22 | ||||
| -rwxr-xr-x | tools/generate_operator_out.py (renamed from tools/generate-operator-out.py) | 0 |
12 files changed, 31 insertions, 13 deletions
diff --git a/Android.bp b/Android.bp index bb92e5f2f8..bfd86edfa6 100644 --- a/Android.bp +++ b/Android.bp @@ -45,6 +45,7 @@ subdirs = [ "sigchainlib", "simulator", "test", + "tools", "tools/breakpoint-logger", "tools/cpp-define-generator", "tools/dmtracedump", diff --git a/compiler/Android.bp b/compiler/Android.bp index ba08d7975b..40c676c406 100644 --- a/compiler/Android.bp +++ b/compiler/Android.bp @@ -199,8 +199,8 @@ art_cc_defaults { gensrcs { name: "art_compiler_operator_srcs", - cmd: "$(location generate-operator-out.py) art/compiler $(in) > $(out)", - tool_files: ["generate-operator-out.py"], + cmd: "$(location generate_operator_out) art/compiler $(in) > $(out)", + tools: ["generate_operator_out"], srcs: [ "dex/dex_to_dex_compiler.h", "driver/compiler_driver.h", diff --git a/compiler/generate-operator-out.py b/compiler/generate-operator-out.py deleted file mode 120000 index cc291d20c1..0000000000 --- a/compiler/generate-operator-out.py +++ /dev/null @@ -1 +0,0 @@ -../tools/generate-operator-out.py
\ No newline at end of file diff --git a/dex2oat/Android.bp b/dex2oat/Android.bp index d1272c9d6a..b67898d2a6 100644 --- a/dex2oat/Android.bp +++ b/dex2oat/Android.bp @@ -54,8 +54,8 @@ art_cc_defaults { gensrcs { name: "art_dex2oat_operator_srcs", - cmd: "$(location generate-operator-out.py) art/dex2oat $(in) > $(out)", - tool_files: ["generate-operator-out.py"], + cmd: "$(location generate_operator_out) art/dex2oat $(in) > $(out)", + tools: ["generate_operator_out"], srcs: [ "linker/image_writer.h", ], diff --git a/dex2oat/generate-operator-out.py b/dex2oat/generate-operator-out.py deleted file mode 120000 index cc291d20c1..0000000000 --- a/dex2oat/generate-operator-out.py +++ /dev/null @@ -1 +0,0 @@ -../tools/generate-operator-out.py
\ No newline at end of file diff --git a/libdexfile/Android.bp b/libdexfile/Android.bp index 90c603f290..abf35a29a4 100644 --- a/libdexfile/Android.bp +++ b/libdexfile/Android.bp @@ -71,8 +71,8 @@ cc_defaults { gensrcs { name: "dexfile_operator_srcs", - cmd: "$(location generate-operator-out.py) art/libdexfile $(in) > $(out)", - tool_files: ["generate-operator-out.py"], + cmd: "$(location generate_operator_out) art/libdexfile $(in) > $(out)", + tools: ["generate_operator_out"], srcs: [ "dex/dex_file.h", "dex/dex_instruction.h", diff --git a/libdexfile/generate-operator-out.py b/libdexfile/generate-operator-out.py deleted file mode 120000 index cc291d20c1..0000000000 --- a/libdexfile/generate-operator-out.py +++ /dev/null @@ -1 +0,0 @@ -../tools/generate-operator-out.py
\ No newline at end of file diff --git a/openjdkjvmti/generate-operator-out.py b/openjdkjvmti/generate-operator-out.py deleted file mode 120000 index cc291d20c1..0000000000 --- a/openjdkjvmti/generate-operator-out.py +++ /dev/null @@ -1 +0,0 @@ -../tools/generate-operator-out.py
\ No newline at end of file diff --git a/runtime/Android.bp b/runtime/Android.bp index 1ac770fd06..dc0813dcd8 100644 --- a/runtime/Android.bp +++ b/runtime/Android.bp @@ -434,8 +434,8 @@ cc_defaults { gensrcs { name: "art_operator_srcs", - cmd: "$(location generate-operator-out.py) art/runtime $(in) > $(out)", - tool_files: ["generate-operator-out.py"], + cmd: "$(location generate_operator_out) art/runtime $(in) > $(out)", + tools: ["generate_operator_out"], srcs: [ "arch/instruction_set.h", "base/allocator.h", diff --git a/runtime/generate-operator-out.py b/runtime/generate-operator-out.py deleted file mode 120000 index cc291d20c1..0000000000 --- a/runtime/generate-operator-out.py +++ /dev/null @@ -1 +0,0 @@ -../tools/generate-operator-out.py
\ No newline at end of file diff --git a/tools/Android.bp b/tools/Android.bp new file mode 100644 index 0000000000..5093d7a45b --- /dev/null +++ b/tools/Android.bp @@ -0,0 +1,22 @@ +// +// Copyright (C) 2018 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. +// + +python_binary_host { + name: "generate_operator_out", + srcs: [ + "generate_operator_out.py", + ], +} diff --git a/tools/generate-operator-out.py b/tools/generate_operator_out.py index 3bd62fe1db..3bd62fe1db 100755 --- a/tools/generate-operator-out.py +++ b/tools/generate_operator_out.py |