diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-07-22 22:12:44 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-07-22 22:12:44 +0000 |
| commit | 02d76b9cd64d752d7a8cdd74afaad55db0d67040 (patch) | |
| tree | e7c0cc2209fe0c13dccac37a6ab88be30969ac4f /apex/apex.go | |
| parent | 0ce5d89d5730c1cb7075e6be6c5f97f0ebeff877 (diff) | |
| parent | d771592f830ef3d7ef62fb4f8fbc252ee43a951c (diff) | |
| download | build_soong-02d76b9cd64d752d7a8cdd74afaad55db0d67040.tar.gz build_soong-02d76b9cd64d752d7a8cdd74afaad55db0d67040.tar.bz2 build_soong-02d76b9cd64d752d7a8cdd74afaad55db0d67040.zip | |
Merge cherrypicks of [12212499, 12213565, 12213741, 12213742, 12213743, 12213702, 12213319, 12213491, 12213118, 12213065, 12213602, 12213603] into rvc-releaseandroid-vts-11.0_r2android-vts-11.0_r1android-security-11.0.0_r1android-platform-11.0.0_r2android-platform-11.0.0_r1android-cts-11.0_r2android-cts-11.0_r1android-11.0.0_r5android-11.0.0_r4android-11.0.0_r3android-11.0.0_r2android-11.0.0_r17android-11.0.0_r1
Change-Id: I131b23ebe4f88331ec4992fcc27ece8a0a064851
Diffstat (limited to 'apex/apex.go')
| -rw-r--r-- | apex/apex.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apex/apex.go b/apex/apex.go index f9c9b87f..b4fae341 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -2112,7 +2112,7 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { case android.PrebuiltDepTag: // If the prebuilt is force disabled, remember to delete the prebuilt file // that might have been installed in the previous builds - if prebuilt, ok := child.(*Prebuilt); ok && prebuilt.isForceDisabled() { + if prebuilt, ok := child.(prebuilt); ok && prebuilt.isForceDisabled() { a.prebuiltFileToDelete = prebuilt.InstallFilename() } } |