diff options
| author | Cole Faust <colefaust@google.com> | 2022-09-02 19:14:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-09-02 19:14:28 +0000 |
| commit | 3e21821be800a45ceb10ebc86df3165ab6535818 (patch) | |
| tree | 492d8df9372a37b05ed3c473cbd75d66fe0e723c | |
| parent | 7368b312e99de0f2809afde1ea5a1b21d44019b0 (diff) | |
| parent | 713073831fb212d8332a2923a7b5ea580a332f43 (diff) | |
| download | sdk-3e21821be800a45ceb10ebc86df3165ab6535818.tar.gz | |
Merge "Fix module-file name collisions" am: e4793273da am: 713073831f
Original change: https://android-review.googlesource.com/c/platform/sdk/+/2201971
Change-Id: I53e789ec7ed81aef9485c9b730290af45ecdefd7
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 |