diff options
| author | Devin Moore <devinmoore@google.com> | 2023-12-07 20:41:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-12-07 20:41:00 +0000 |
| commit | 9a6a3eec6c52664daa9bea3cc08d682ecf31aab3 (patch) | |
| tree | 3738a2fb30b544fabddda1b0b901b4e9ddc3eb9f | |
| parent | 2def9d82f2c867725cddfa4565ca0b3fc7507af7 (diff) | |
| download | aidl-9a6a3eec6c52664daa9bea3cc08d682ecf31aab3.tar.gz | |
Revert "Add error when in-development aidl_interface module is frozen: true"
This reverts commit 2def9d82f2c867725cddfa4565ca0b3fc7507af7.
Reason for revert: Broke builds b/315354517 - maybe there was a race between this and another CL?
Change-Id: I03f55f55ccf9d61cf95dd77704df9394428b37a7
| -rw-r--r-- | build/aidl_api.go | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/build/aidl_api.go b/build/aidl_api.go index 9c2e1dbd..c9a20546 100644 --- a/build/aidl_api.go +++ b/build/aidl_api.go @@ -562,18 +562,8 @@ func (m *aidlApi) checkForDevelopment(ctx android.ModuleContext, latestVersionDu hasDevCommand. Text(fmt.Sprintf("2> /dev/null && %s && exit -1 || echo $? >", msg)).Output(hasDevPath) } else { - // if is explicitly frozen - if m.isFrozen() { - // Throw an error if checkapi returns WITH differences - msg := fmt.Sprintf("echo \"Interface %s can not be marked \\`frozen: true\\` because there are changes "+ - "between the current version and the last frozen version.\"", m.properties.BaseName) - hasDevCommand. - Text(fmt.Sprintf("2> /dev/null || ( %s && exit -1) && echo 0 >", msg)).Output(hasDevPath) - } else { - hasDevCommand. - Text("2> /dev/null; echo $? >").Output(hasDevPath) - } - + hasDevCommand. + Text("2> /dev/null; echo $? >").Output(hasDevPath) } } else { // We know there are different imports which means has_development must be true |