diff options
| author | 2019-05-28 16:26:05 +0000 | |
|---|---|---|
| committer | 2019-05-28 16:26:05 +0000 | |
| commit | ff3f43857fce71fefac445dbf953386f1b7c8c03 (patch) | |
| tree | 6bca2c1dde3d44178a793b5892961e7e1069ff34 /java | |
| parent | 7101d4444274ada773c291426cbc20e9d5f8f169 (diff) | |
| parent | 7211910fd0d158cd2a4e7d610f1e32b8c9d25817 (diff) | |
Merge changes If15abf79,Iaae177ef
* changes:
Add manifest_check tool
Move manifest_fixer to a python_binary_host module
Diffstat (limited to 'java')
| -rw-r--r-- | java/config/config.go | 3 | ||||
| -rw-r--r-- | java/config/makevars.go | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/java/config/config.go b/java/config/config.go index 46cd361d7..f9552d5a1 100644 --- a/java/config/config.go +++ b/java/config/config.go @@ -142,7 +142,8 @@ func init() { hostBinToolVariableWithPrebuilt("Aapt2Cmd", "prebuilts/sdk/tools", "aapt2") - pctx.SourcePathVariable("ManifestFixerCmd", "build/soong/scripts/manifest_fixer.py") + pctx.HostBinToolVariable("ManifestCheckCmd", "manifest_check") + pctx.HostBinToolVariable("ManifestFixerCmd", "manifest_fixer") pctx.HostBinToolVariable("ManifestMergerCmd", "manifest-merger") diff --git a/java/config/makevars.go b/java/config/makevars.go index 6881caff6..9c7851174 100644 --- a/java/config/makevars.go +++ b/java/config/makevars.go @@ -73,6 +73,7 @@ func makeVarsProvider(ctx android.MakeVarsContext) { ctx.Strict("EXTRACT_JAR_PACKAGES", "${ExtractJarPackagesCmd}") + ctx.Strict("MANIFEST_CHECK", "${ManifestCheckCmd}") ctx.Strict("MANIFEST_FIXER", "${ManifestFixerCmd}") ctx.Strict("ANDROID_MANIFEST_MERGER", "${ManifestMergerCmd}") |