| commit | 503156cc848625fb871c87f19465de29f6b77d90 | [log] [tgz] |
|---|---|---|
| author | Wei Li <weiwli@google.com> | Mon Oct 07 18:37:18 2024 +0000 |
| committer | Wei Li <weiwli@google.com> | Mon Oct 07 18:37:18 2024 +0000 |
| tree | a84a0633197e9de65a41a59668fbe6ad39ace02e | |
| parent | 1f53fec8b2f1b83ca29bfad9472d94e28dea5d48 [diff] [blame] | |
| parent | 66470977be15998215cbfd4a5e357acb451c5e96 [diff] [blame] |
[conflict] Merge "Add new module type for adb_keys." into main am: 10903c73f6 am: 66470977be Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3274532 Change-Id: I9ad79ac814fd7a0f0f0f29fcb4a533fd73f52ab2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/android/variable.go b/android/variable.go index fbab93b..ab373b9 100644 --- a/android/variable.go +++ b/android/variable.go
@@ -525,6 +525,8 @@ PartitionVarsForSoongMigrationOnlyDoNotUse PartitionVariables ExtraAllowedDepsTxt *string `json:",omitempty"` + + AdbKeys *string `json:",omitempty"` } type PartitionQualifiedVariablesType struct {