diff options
| author | Cole Faust <colefaust@google.com> | 2022-09-02 21:22:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-09-02 21:22:43 +0000 |
| commit | 0089de8ebae6cdd7291802ed20b8d3c6d8d13212 (patch) | |
| tree | 492d8df9372a37b05ed3c473cbd75d66fe0e723c | |
| parent | 7368b312e99de0f2809afde1ea5a1b21d44019b0 (diff) | |
| parent | c2aaa90b6e53e0beae5801d4cf233c6916ea6a28 (diff) | |
| download | sdk-0089de8ebae6cdd7291802ed20b8d3c6d8d13212.tar.gz | |
Merge "Fix module-file name collisions" am: e4793273da am: 713073831f am: 3e21821be8 am: 5e78e9e93a am: c2aaa90b6eandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-dev
Original change: https://android-review.googlesource.com/c/platform/sdk/+/2201971
Change-Id: I566141c764e9c1edb9d0f99cc79af7b0b1e3aa24
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 |