diff options
| author |  Googler <noreply@google.com> | 2016-11-30 22:40:59 +0000 |
|---|---|---|
| committer |  Irina Iancu <elenairina@google.com> | 2016-12-01 10:17:49 +0000 |
| commit | 3e8a15267e9c7fffb6a65ee63e4dd6ec10e522d5 (patch) | |
| tree | 309cb0409b90107bb70a3b7f8b0f6c8d08b24a90 /src/tools/android/java/com/google/devtools/build/android/proto | |
| parent | 2a2be3907981d9654575493c7012d95d1241f373 (diff) | |
unknown commit of 5: Fixing the merge warning messages in transitive library overwrites.
Record the sources are overwritten during merging.
--
MOS_MIGRATED_REVID=140654137
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build/android/proto')
| -rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/proto/serialize_format.proto | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/proto/serialize_format.proto b/src/tools/android/java/com/google/devtools/build/android/proto/serialize_format.proto index 3c24f5f54d..122d3569da 100644 --- a/src/tools/android/java/com/google/devtools/build/android/proto/serialize_format.proto +++ b/src/tools/android/java/com/google/devtools/build/android/proto/serialize_format.proto @@ -58,6 +58,8 @@ message DataValue { message ProtoSource { // Required optional string filename = 1; + // The indexes of sources this source replaces. + repeated uint32 overwritten = 2; } // The container for a serialized xml value. |