diff options
| author |  Googler <noreply@google.com> | 2015-02-25 00:42:09 +0000 |
|---|---|---|
| committer |  Han-Wen Nienhuys <hanwen@google.com> | 2015-02-25 00:42:09 +0000 |
| commit | faa66ade02667a849d532768458d5e1645506081 (patch) | |
| tree | 2425135298344ad867affea99a3797c65f00e951 /src/main/protobuf/bundlemerge.proto | |
| parent | c5102fc5cec4336140889510a87ef1c57810911c (diff) | |
Pass bundle_id attribute to PlMerge if it is explicitly set
* Adds primary and fallback bundle ID fields
* Adds conflict resolution that considers IDs in order: plist file, primary ID (set in BUILD file), fallback ID (Blaze default). If plist and primary are both set, they should be equal, otherwise an error is thrown.
--
MOS_MIGRATED_REVID=87106031
Diffstat (limited to 'src/main/protobuf/bundlemerge.proto')
| -rw-r--r-- | src/main/protobuf/bundlemerge.proto | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/main/protobuf/bundlemerge.proto b/src/main/protobuf/bundlemerge.proto index b04eba3aa6..b124d7edbc 100644 --- a/src/main/protobuf/bundlemerge.proto +++ b/src/main/protobuf/bundlemerge.proto @@ -65,6 +65,12 @@ message Control { // Name of the executable for this bundle or unset if no such executable // exists. optional string executable_name = 13; + + // A reverse-DNS string identifier for this bundle. + optional string primary_bundle_identifier = 14; + + // A fallback bundle identifier used when primary is not filled. + optional string fallback_bundle_identifier = 15; } // Represents a zip file to merge with the final zip. |