Colin Cross | 3165695 | 2018-05-24 16:11:20 -0700 | [diff] [blame] | 1 | // Copyright 2018 Google Inc. All rights reserved. |
| 2 | // |
| 3 | // Licensed under the Apache License, Version 2.0 (the "License"); |
| 4 | // you may not use this file except in compliance with the License. |
| 5 | // You may obtain a copy of the License at |
| 6 | // |
| 7 | // http://www.apache.org/licenses/LICENSE-2.0 |
| 8 | // |
| 9 | // Unless required by applicable law or agreed to in writing, software |
| 10 | // distributed under the License is distributed on an "AS IS" BASIS, |
| 11 | // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 12 | // See the License for the specific language governing permissions and |
| 13 | // limitations under the License. |
| 14 | |
| 15 | package java |
| 16 | |
| 17 | import ( |
Colin Cross | e4246ab | 2019-02-05 21:55:21 -0800 | [diff] [blame] | 18 | "fmt" |
Spandan Das | c8cb0c3 | 2021-12-08 17:00:38 +0000 | [diff] [blame] | 19 | "strconv" |
Colin Cross | 1b6a3cf | 2018-07-24 14:51:30 -0700 | [diff] [blame] | 20 | "strings" |
Colin Cross | 3165695 | 2018-05-24 16:11:20 -0700 | [diff] [blame] | 21 | |
| 22 | "github.com/google/blueprint" |
| 23 | |
| 24 | "android/soong/android" |
Ulya Trafimovich | 31e444e | 2020-08-14 17:32:16 +0100 | [diff] [blame] | 25 | "android/soong/dexpreopt" |
Colin Cross | 3165695 | 2018-05-24 16:11:20 -0700 | [diff] [blame] | 26 | ) |
| 27 | |
| 28 | var manifestFixerRule = pctx.AndroidStaticRule("manifestFixer", |
| 29 | blueprint.RuleParams{ |
Colin Cross | 7b59e7b | 2018-09-10 13:35:13 -0700 | [diff] [blame] | 30 | Command: `${config.ManifestFixerCmd} ` + |
Colin Cross | 7b59e7b | 2018-09-10 13:35:13 -0700 | [diff] [blame] | 31 | `$args $in $out`, |
Colin Cross | 3165695 | 2018-05-24 16:11:20 -0700 | [diff] [blame] | 32 | CommandDeps: []string{"${config.ManifestFixerCmd}"}, |
| 33 | }, |
Gurpreet Singh | 75d65f3 | 2022-01-24 17:44:05 +0000 | [diff] [blame] | 34 | "args") |
Colin Cross | 3165695 | 2018-05-24 16:11:20 -0700 | [diff] [blame] | 35 | |
| 36 | var manifestMergerRule = pctx.AndroidStaticRule("manifestMerger", |
| 37 | blueprint.RuleParams{ |
Colin Cross | aa1c6f1 | 2019-04-19 16:25:38 -0700 | [diff] [blame] | 38 | Command: `${config.ManifestMergerCmd} $args --main $in $libs --out $out`, |
Colin Cross | 87ecbfe | 2019-02-26 22:14:04 -0800 | [diff] [blame] | 39 | CommandDeps: []string{"${config.ManifestMergerCmd}"}, |
Colin Cross | 3165695 | 2018-05-24 16:11:20 -0700 | [diff] [blame] | 40 | }, |
Colin Cross | aa1c6f1 | 2019-04-19 16:25:38 -0700 | [diff] [blame] | 41 | "args", "libs") |
Colin Cross | 3165695 | 2018-05-24 16:11:20 -0700 | [diff] [blame] | 42 | |
Spandan Das | c8cb0c3 | 2021-12-08 17:00:38 +0000 | [diff] [blame] | 43 | // targetSdkVersion for manifest_fixer |
| 44 | // When TARGET_BUILD_APPS is not empty, this method returns 10000 for modules targeting an unreleased SDK |
| 45 | // This enables release builds (that run with TARGET_BUILD_APPS=[val...]) to target APIs that have not yet been finalized as part of an SDK |
Harshit Mahajan | 5b8b730 | 2022-06-10 11:24:05 +0000 | [diff] [blame] | 46 | func targetSdkVersionForManifestFixer(ctx android.ModuleContext, params ManifestFixerParams) string { |
Spandan Das | ca70fc4 | 2023-03-01 23:38:49 +0000 | [diff] [blame] | 47 | targetSdkVersionLevel := params.SdkContext.TargetSdkVersion(ctx) |
Harshit Mahajan | 5b8b730 | 2022-06-10 11:24:05 +0000 | [diff] [blame] | 48 | |
| 49 | // Check if we want to return 10000 |
Spandan Das | 9f7ae7f | 2022-07-25 00:34:18 +0000 | [diff] [blame] | 50 | // TODO(b/240294501): Determine the rules for handling test apexes |
Spandan Das | ca70fc4 | 2023-03-01 23:38:49 +0000 | [diff] [blame] | 51 | if shouldReturnFinalOrFutureInt(ctx, targetSdkVersionLevel, params.EnforceDefaultTargetSdkVersion) { |
Spandan Das | c8cb0c3 | 2021-12-08 17:00:38 +0000 | [diff] [blame] | 52 | return strconv.Itoa(android.FutureApiLevel.FinalOrFutureInt()) |
| 53 | } |
Spandan Das | ca70fc4 | 2023-03-01 23:38:49 +0000 | [diff] [blame] | 54 | targetSdkVersion, err := targetSdkVersionLevel.EffectiveVersionString(ctx) |
Spandan Das | c8cb0c3 | 2021-12-08 17:00:38 +0000 | [diff] [blame] | 55 | if err != nil { |
| 56 | ctx.ModuleErrorf("invalid targetSdkVersion: %s", err) |
| 57 | } |
| 58 | return targetSdkVersion |
| 59 | } |
| 60 | |
Harshit Mahajan | 5b8b730 | 2022-06-10 11:24:05 +0000 | [diff] [blame] | 61 | // Return true for modules targeting "current" if either |
| 62 | // 1. The module is built in unbundled mode (TARGET_BUILD_APPS not empty) |
| 63 | // 2. The module is run as part of MTS, and should be testable on stable branches |
| 64 | // Do not return 10000 if we are enforcing default targetSdkVersion and sdk has been finalised |
Spandan Das | ca70fc4 | 2023-03-01 23:38:49 +0000 | [diff] [blame] | 65 | func shouldReturnFinalOrFutureInt(ctx android.ModuleContext, targetSdkVersionLevel android.ApiLevel, enforceDefaultTargetSdkVersion bool) bool { |
Spandan Das | fb6a1ee | 2023-04-27 16:08:26 +0000 | [diff] [blame] | 66 | // If this is a REL branch, do not return 10000 |
| 67 | if ctx.Config().PlatformSdkFinal() { |
Harshit Mahajan | 5b8b730 | 2022-06-10 11:24:05 +0000 | [diff] [blame] | 68 | return false |
| 69 | } |
Spandan Das | fb6a1ee | 2023-04-27 16:08:26 +0000 | [diff] [blame] | 70 | // If this a module targeting an unreleased SDK (MTS or unbundled builds), return 10000 |
Spandan Das | ca70fc4 | 2023-03-01 23:38:49 +0000 | [diff] [blame] | 71 | return targetSdkVersionLevel.IsPreview() && (ctx.Config().UnbundledBuildApps() || includedInMts(ctx.Module())) |
Harshit Mahajan | 5b8b730 | 2022-06-10 11:24:05 +0000 | [diff] [blame] | 72 | } |
| 73 | |
Spandan Das | b041087 | 2024-06-25 03:30:03 +0000 | [diff] [blame^] | 74 | // Helper function that returns true if android_test, android_test_helper_app, java_test are in an MTS suite. |
Spandan Das | 9f7ae7f | 2022-07-25 00:34:18 +0000 | [diff] [blame] | 75 | func includedInMts(module android.Module) bool { |
| 76 | if test, ok := module.(androidTestApp); ok { |
| 77 | return test.includedInTestSuite("mts") |
| 78 | } |
Spandan Das | b041087 | 2024-06-25 03:30:03 +0000 | [diff] [blame^] | 79 | // java_test |
| 80 | if test, ok := module.(*Test); ok { |
| 81 | return android.PrefixInList(test.testProperties.Test_suites, "mts") |
| 82 | } |
Spandan Das | 9f7ae7f | 2022-07-25 00:34:18 +0000 | [diff] [blame] | 83 | return false |
| 84 | } |
| 85 | |
Gurpreet Singh | 75d65f3 | 2022-01-24 17:44:05 +0000 | [diff] [blame] | 86 | type ManifestFixerParams struct { |
Harshit Mahajan | 5b8b730 | 2022-06-10 11:24:05 +0000 | [diff] [blame] | 87 | SdkContext android.SdkContext |
| 88 | ClassLoaderContexts dexpreopt.ClassLoaderContextMap |
| 89 | IsLibrary bool |
| 90 | DefaultManifestVersion string |
| 91 | UseEmbeddedNativeLibs bool |
| 92 | UsesNonSdkApis bool |
| 93 | UseEmbeddedDex bool |
| 94 | HasNoCode bool |
| 95 | TestOnly bool |
| 96 | LoggingParent string |
| 97 | EnforceDefaultTargetSdkVersion bool |
Gurpreet Singh | 75d65f3 | 2022-01-24 17:44:05 +0000 | [diff] [blame] | 98 | } |
Colin Cross | 1b6a3cf | 2018-07-24 14:51:30 -0700 | [diff] [blame] | 99 | |
Gurpreet Singh | 75d65f3 | 2022-01-24 17:44:05 +0000 | [diff] [blame] | 100 | // Uses manifest_fixer.py to inject minSdkVersion, etc. into an AndroidManifest.xml |
Gurpreet Singh | 7deabfa | 2022-02-10 13:28:35 +0000 | [diff] [blame] | 101 | func ManifestFixer(ctx android.ModuleContext, manifest android.Path, |
| 102 | params ManifestFixerParams) android.Path { |
Colin Cross | 1b6a3cf | 2018-07-24 14:51:30 -0700 | [diff] [blame] | 103 | var args []string |
Gurpreet Singh | 75d65f3 | 2022-01-24 17:44:05 +0000 | [diff] [blame] | 104 | |
| 105 | if params.IsLibrary { |
Colin Cross | 1b6a3cf | 2018-07-24 14:51:30 -0700 | [diff] [blame] | 106 | args = append(args, "--library") |
Gurpreet Singh | 75d65f3 | 2022-01-24 17:44:05 +0000 | [diff] [blame] | 107 | } else if params.SdkContext != nil { |
Gurpreet Singh | 7deabfa | 2022-02-10 13:28:35 +0000 | [diff] [blame] | 108 | minSdkVersion, err := params.SdkContext.MinSdkVersion(ctx).EffectiveVersion(ctx) |
Colin Cross | e4246ab | 2019-02-05 21:55:21 -0800 | [diff] [blame] | 109 | if err != nil { |
Gurpreet Singh | 7deabfa | 2022-02-10 13:28:35 +0000 | [diff] [blame] | 110 | ctx.ModuleErrorf("invalid minSdkVersion: %s", err) |
Colin Cross | e4246ab | 2019-02-05 21:55:21 -0800 | [diff] [blame] | 111 | } |
Jiyong Park | 54105c4 | 2021-03-31 18:17:53 +0900 | [diff] [blame] | 112 | if minSdkVersion.FinalOrFutureInt() >= 23 { |
Gurpreet Singh | 75d65f3 | 2022-01-24 17:44:05 +0000 | [diff] [blame] | 113 | args = append(args, fmt.Sprintf("--extract-native-libs=%v", !params.UseEmbeddedNativeLibs)) |
| 114 | } else if params.UseEmbeddedNativeLibs { |
Pedro Loureiro | ea2f5ef | 2022-04-22 13:53:16 +0000 | [diff] [blame] | 115 | ctx.ModuleErrorf("module attempted to store uncompressed native libraries, but minSdkVersion=%s doesn't support it", |
| 116 | minSdkVersion.String()) |
Colin Cross | e4246ab | 2019-02-05 21:55:21 -0800 | [diff] [blame] | 117 | } |
Colin Cross | 1b6a3cf | 2018-07-24 14:51:30 -0700 | [diff] [blame] | 118 | } |
Colin Cross | 3165695 | 2018-05-24 16:11:20 -0700 | [diff] [blame] | 119 | |
Gurpreet Singh | 75d65f3 | 2022-01-24 17:44:05 +0000 | [diff] [blame] | 120 | if params.UsesNonSdkApis { |
David Brazdil | d25060a | 2019-02-18 18:24:16 +0000 | [diff] [blame] | 121 | args = append(args, "--uses-non-sdk-api") |
| 122 | } |
| 123 | |
Gurpreet Singh | 75d65f3 | 2022-01-24 17:44:05 +0000 | [diff] [blame] | 124 | if params.UseEmbeddedDex { |
Sasha Smundak | d2e5361 | 2019-05-14 17:03:24 -0700 | [diff] [blame] | 125 | args = append(args, "--use-embedded-dex") |
Colin Cross | 46abdad | 2019-02-07 13:07:08 -0800 | [diff] [blame] | 126 | } |
| 127 | |
Gurpreet Singh | 75d65f3 | 2022-01-24 17:44:05 +0000 | [diff] [blame] | 128 | if params.ClassLoaderContexts != nil { |
Ulya Trafimovich | f5d91bb | 2022-05-04 12:00:02 +0100 | [diff] [blame] | 129 | // Libraries propagated via `uses_libs`/`optional_uses_libs` are also added (they may be |
| 130 | // propagated from dependencies). |
| 131 | requiredUsesLibs, optionalUsesLibs := params.ClassLoaderContexts.UsesLibs() |
Gurpreet Singh | 75d65f3 | 2022-01-24 17:44:05 +0000 | [diff] [blame] | 132 | |
| 133 | for _, usesLib := range requiredUsesLibs { |
| 134 | args = append(args, "--uses-library", usesLib) |
| 135 | } |
| 136 | for _, usesLib := range optionalUsesLibs { |
| 137 | args = append(args, "--optional-uses-library", usesLib) |
| 138 | } |
Colin Cross | 5446e88 | 2019-05-22 10:46:27 -0700 | [diff] [blame] | 139 | } |
| 140 | |
Gurpreet Singh | 75d65f3 | 2022-01-24 17:44:05 +0000 | [diff] [blame] | 141 | if params.HasNoCode { |
Jaewoong Jung | c27ab66 | 2019-05-30 15:51:14 -0700 | [diff] [blame] | 142 | args = append(args, "--has-no-code") |
| 143 | } |
| 144 | |
Gurpreet Singh | 75d65f3 | 2022-01-24 17:44:05 +0000 | [diff] [blame] | 145 | if params.TestOnly { |
| 146 | args = append(args, "--test-only") |
| 147 | } |
| 148 | |
| 149 | if params.LoggingParent != "" { |
| 150 | args = append(args, "--logging-parent", params.LoggingParent) |
Baligh Uddin | 5b16dfb | 2020-02-11 17:27:19 -0800 | [diff] [blame] | 151 | } |
Colin Cross | 1093287 | 2019-04-18 14:27:12 -0700 | [diff] [blame] | 152 | var deps android.Paths |
Gurpreet Singh | 75d65f3 | 2022-01-24 17:44:05 +0000 | [diff] [blame] | 153 | var argsMapper = make(map[string]string) |
Spandan Das | c8cb0c3 | 2021-12-08 17:00:38 +0000 | [diff] [blame] | 154 | |
Gurpreet Singh | 75d65f3 | 2022-01-24 17:44:05 +0000 | [diff] [blame] | 155 | if params.SdkContext != nil { |
Harshit Mahajan | 5b8b730 | 2022-06-10 11:24:05 +0000 | [diff] [blame] | 156 | targetSdkVersion := targetSdkVersionForManifestFixer(ctx, params) |
Gurpreet Singh | 75d65f3 | 2022-01-24 17:44:05 +0000 | [diff] [blame] | 157 | |
Jihoon Kang | 842b999 | 2024-02-08 01:41:51 +0000 | [diff] [blame] | 158 | if useApiFingerprint, fingerprintTargetSdkVersion, fingerprintDeps := |
| 159 | UseApiFingerprint(ctx); useApiFingerprint && ctx.ModuleName() != "framework-res" { |
| 160 | targetSdkVersion = fingerprintTargetSdkVersion |
| 161 | deps = append(deps, fingerprintDeps) |
Gurpreet Singh | 75d65f3 | 2022-01-24 17:44:05 +0000 | [diff] [blame] | 162 | } |
| 163 | |
Paul Duffin | aa2aad6 | 2023-01-31 23:13:45 +0000 | [diff] [blame] | 164 | args = append(args, "--targetSdkVersion ", targetSdkVersion) |
| 165 | |
Gurpreet Singh | 7deabfa | 2022-02-10 13:28:35 +0000 | [diff] [blame] | 166 | minSdkVersion, err := params.SdkContext.MinSdkVersion(ctx).EffectiveVersionString(ctx) |
Gurpreet Singh | 75d65f3 | 2022-01-24 17:44:05 +0000 | [diff] [blame] | 167 | if err != nil { |
Gurpreet Singh | 7deabfa | 2022-02-10 13:28:35 +0000 | [diff] [blame] | 168 | ctx.ModuleErrorf("invalid minSdkVersion: %s", err) |
Gurpreet Singh | 75d65f3 | 2022-01-24 17:44:05 +0000 | [diff] [blame] | 169 | } |
| 170 | |
William Loh | 5a082f9 | 2022-05-17 20:21:50 +0000 | [diff] [blame] | 171 | replaceMaxSdkVersionPlaceholder, err := params.SdkContext.ReplaceMaxSdkVersionPlaceholder(ctx).EffectiveVersion(ctx) |
| 172 | if err != nil { |
| 173 | ctx.ModuleErrorf("invalid ReplaceMaxSdkVersionPlaceholder: %s", err) |
| 174 | } |
| 175 | |
Jihoon Kang | 842b999 | 2024-02-08 01:41:51 +0000 | [diff] [blame] | 176 | if useApiFingerprint, fingerprintMinSdkVersion, fingerprintDeps := |
| 177 | UseApiFingerprint(ctx); useApiFingerprint && ctx.ModuleName() != "framework-res" { |
| 178 | minSdkVersion = fingerprintMinSdkVersion |
| 179 | deps = append(deps, fingerprintDeps) |
Gurpreet Singh | 75d65f3 | 2022-01-24 17:44:05 +0000 | [diff] [blame] | 180 | } |
| 181 | |
| 182 | if err != nil { |
Gurpreet Singh | 7deabfa | 2022-02-10 13:28:35 +0000 | [diff] [blame] | 183 | ctx.ModuleErrorf("invalid minSdkVersion: %s", err) |
Gurpreet Singh | 75d65f3 | 2022-01-24 17:44:05 +0000 | [diff] [blame] | 184 | } |
| 185 | args = append(args, "--minSdkVersion ", minSdkVersion) |
William Loh | 5a082f9 | 2022-05-17 20:21:50 +0000 | [diff] [blame] | 186 | args = append(args, "--replaceMaxSdkVersionPlaceholder ", strconv.Itoa(replaceMaxSdkVersionPlaceholder.FinalOrFutureInt())) |
Gurpreet Singh | 75d65f3 | 2022-01-24 17:44:05 +0000 | [diff] [blame] | 187 | args = append(args, "--raise-min-sdk-version") |
Jiyong Park | 6a927c4 | 2020-01-21 02:03:43 +0900 | [diff] [blame] | 188 | } |
Alexei Nicoara | 69cf0f3 | 2022-07-27 14:59:18 +0100 | [diff] [blame] | 189 | if params.DefaultManifestVersion != "" { |
| 190 | args = append(args, "--override-placeholder-version", params.DefaultManifestVersion) |
| 191 | } |
Jiyong Park | 6a927c4 | 2020-01-21 02:03:43 +0900 | [diff] [blame] | 192 | |
Gurpreet Singh | 7deabfa | 2022-02-10 13:28:35 +0000 | [diff] [blame] | 193 | fixedManifest := android.PathForModuleOut(ctx, "manifest_fixer", "AndroidManifest.xml") |
Gurpreet Singh | 75d65f3 | 2022-01-24 17:44:05 +0000 | [diff] [blame] | 194 | argsMapper["args"] = strings.Join(args, " ") |
Colin Cross | 1093287 | 2019-04-18 14:27:12 -0700 | [diff] [blame] | 195 | |
Gurpreet Singh | 7deabfa | 2022-02-10 13:28:35 +0000 | [diff] [blame] | 196 | ctx.Build(pctx, android.BuildParams{ |
Colin Cross | 90c25c6 | 2019-04-19 16:22:57 -0700 | [diff] [blame] | 197 | Rule: manifestFixerRule, |
| 198 | Description: "fix manifest", |
Gurpreet Singh | 7deabfa | 2022-02-10 13:28:35 +0000 | [diff] [blame] | 199 | Input: manifest, |
Colin Cross | 90c25c6 | 2019-04-19 16:22:57 -0700 | [diff] [blame] | 200 | Implicits: deps, |
| 201 | Output: fixedManifest, |
Gurpreet Singh | 75d65f3 | 2022-01-24 17:44:05 +0000 | [diff] [blame] | 202 | Args: argsMapper, |
Colin Cross | 3165695 | 2018-05-24 16:11:20 -0700 | [diff] [blame] | 203 | }) |
Colin Cross | 3165695 | 2018-05-24 16:11:20 -0700 | [diff] [blame] | 204 | |
Colin Cross | 8eebb13 | 2020-01-29 20:07:03 -0800 | [diff] [blame] | 205 | return fixedManifest.WithoutRel() |
Colin Cross | 90c25c6 | 2019-04-19 16:22:57 -0700 | [diff] [blame] | 206 | } |
Colin Cross | 3165695 | 2018-05-24 16:11:20 -0700 | [diff] [blame] | 207 | |
Alix | f7a1027 | 2023-09-27 16:47:56 +0000 | [diff] [blame] | 208 | type ManifestMergerParams struct { |
| 209 | staticLibManifests android.Paths |
| 210 | isLibrary bool |
Alix | 96ea8845 | 2023-08-31 15:48:23 +0000 | [diff] [blame] | 211 | packageName string |
Alix | f7a1027 | 2023-09-27 16:47:56 +0000 | [diff] [blame] | 212 | } |
| 213 | |
| 214 | func manifestMerger(ctx android.ModuleContext, manifest android.Path, |
| 215 | params ManifestMergerParams) android.Path { |
Colin Cross | aa1c6f1 | 2019-04-19 16:25:38 -0700 | [diff] [blame] | 216 | |
Alix | 96ea8845 | 2023-08-31 15:48:23 +0000 | [diff] [blame] | 217 | var args []string |
Alix | f7a1027 | 2023-09-27 16:47:56 +0000 | [diff] [blame] | 218 | if !params.isLibrary { |
Colin Cross | aa1c6f1 | 2019-04-19 16:25:38 -0700 | [diff] [blame] | 219 | // Follow Gradle's behavior, only pass --remove-tools-declarations when merging app manifests. |
Alix | 96ea8845 | 2023-08-31 15:48:23 +0000 | [diff] [blame] | 220 | args = append(args, "--remove-tools-declarations") |
| 221 | } |
| 222 | |
| 223 | packageName := params.packageName |
| 224 | if packageName != "" { |
| 225 | args = append(args, "--property PACKAGE="+packageName) |
Colin Cross | aa1c6f1 | 2019-04-19 16:25:38 -0700 | [diff] [blame] | 226 | } |
| 227 | |
Colin Cross | 90c25c6 | 2019-04-19 16:22:57 -0700 | [diff] [blame] | 228 | mergedManifest := android.PathForModuleOut(ctx, "manifest_merger", "AndroidManifest.xml") |
| 229 | ctx.Build(pctx, android.BuildParams{ |
| 230 | Rule: manifestMergerRule, |
| 231 | Description: "merge manifest", |
| 232 | Input: manifest, |
Alix | f7a1027 | 2023-09-27 16:47:56 +0000 | [diff] [blame] | 233 | Implicits: params.staticLibManifests, |
Colin Cross | 90c25c6 | 2019-04-19 16:22:57 -0700 | [diff] [blame] | 234 | Output: mergedManifest, |
| 235 | Args: map[string]string{ |
Alix | f7a1027 | 2023-09-27 16:47:56 +0000 | [diff] [blame] | 236 | "libs": android.JoinWithPrefix(params.staticLibManifests.Strings(), "--libs "), |
Alix | 96ea8845 | 2023-08-31 15:48:23 +0000 | [diff] [blame] | 237 | "args": strings.Join(args, " "), |
Colin Cross | 90c25c6 | 2019-04-19 16:22:57 -0700 | [diff] [blame] | 238 | }, |
| 239 | }) |
| 240 | |
Colin Cross | 8eebb13 | 2020-01-29 20:07:03 -0800 | [diff] [blame] | 241 | return mergedManifest.WithoutRel() |
Colin Cross | 3165695 | 2018-05-24 16:11:20 -0700 | [diff] [blame] | 242 | } |