diff options
| author | 2022-08-30 17:12:52 +0000 | |
|---|---|---|
| committer | 2022-08-30 17:12:52 +0000 | |
| commit | e08313c3e1e6f6cbbb67759214e1dbde11696c3c (patch) | |
| tree | 73cf3f0c326b8aa6f500aea10f8e8a184cc4a22a | |
| parent | 742cb88169037ff09f87822293fe102abe84486a (diff) | |
| parent | 56c5925e2472a37d8e0779963a7aa4da3f19ddb0 (diff) | |
Resolve conflict in naming of ahat module and file am: 196d4674dc am: 4075ae5736 am: e987819f75 am: 56c5925e24
Original change: https://android-review.googlesource.com/c/platform/art/+/2200104
Change-Id: I258df077e13023173d5d41559612460bb589c6f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | tools/ahat/Android.bp | 2 | ||||
| -rwxr-xr-x | tools/ahat/ahat.sh (renamed from tools/ahat/ahat) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/tools/ahat/Android.bp b/tools/ahat/Android.bp index affa2e0585..5f6ba819fc 100644 --- a/tools/ahat/Android.bp +++ b/tools/ahat/Android.bp @@ -27,7 +27,7 @@ java_binary_host { visibility: [ "//libcore/metrictests/memory/host", ], - wrapper: "ahat", + wrapper: "ahat.sh", srcs: ["src/main/**/*.java"], manifest: "etc/ahat.mf", java_resources: ["etc/style.css"], diff --git a/tools/ahat/ahat b/tools/ahat/ahat.sh index 77c1d6e430..77c1d6e430 100755 --- a/tools/ahat/ahat +++ b/tools/ahat/ahat.sh |