diff options
author | Cole Faust <colefaust@google.com> | 2022-09-02 18:16:42 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-09-02 18:16:42 +0000 |
commit | 713073831fb212d8332a2923a7b5ea580a332f43 (patch) | |
tree | 492d8df9372a37b05ed3c473cbd75d66fe0e723c | |
parent | 7368b312e99de0f2809afde1ea5a1b21d44019b0 (diff) | |
parent | e4793273da1dd6f306e922e386bd8172bc1ca039 (diff) | |
download | sdk-713073831fb212d8332a2923a7b5ea580a332f43.tar.gz |
Merge "Fix module-file name collisions" am: e4793273da
Original change: https://android-review.googlesource.com/c/platform/sdk/+/2201971
Change-Id: I76942bfe7b0fc4a7170358c3f9954d33d10ca31a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | hierarchyviewer/etc/Android.bp | 2 | ||||
-rwxr-xr-x | hierarchyviewer/etc/hierarchyviewer1.sh (renamed from hierarchyviewer/etc/hierarchyviewer1) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/hierarchyviewer/etc/Android.bp b/hierarchyviewer/etc/Android.bp index 82ba8e811..c3579888c 100644 --- a/hierarchyviewer/etc/Android.bp +++ b/hierarchyviewer/etc/Android.bp @@ -18,5 +18,5 @@ package { sh_binary_host { name: "hierarchyviewer1", - src: "hierarchyviewer1", + src: "hierarchyviewer1.sh", } diff --git a/hierarchyviewer/etc/hierarchyviewer1 b/hierarchyviewer/etc/hierarchyviewer1.sh index 424443480..424443480 100755 --- a/hierarchyviewer/etc/hierarchyviewer1 +++ b/hierarchyviewer/etc/hierarchyviewer1.sh |