Merge "Fix the releax_check flag format verb." am: fc3bfe54c3
am: cfeffdc6ec
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1607177 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If52ad78efd887f1a5221fd8feee7a4d448b1e75d
This commit is contained in:
@@ -1293,7 +1293,7 @@ func (u *usesLibrary) verifyUsesLibrariesAPK(ctx android.ModuleContext, apk andr
|
|||||||
Textf("aapt_binary=%s", aapt.String()).Implicit(aapt).
|
Textf("aapt_binary=%s", aapt.String()).Implicit(aapt).
|
||||||
Textf(`uses_library_names="%s"`, strings.Join(u.usesLibraryProperties.Uses_libs, " ")).
|
Textf(`uses_library_names="%s"`, strings.Join(u.usesLibraryProperties.Uses_libs, " ")).
|
||||||
Textf(`optional_uses_library_names="%s"`, strings.Join(u.usesLibraryProperties.Optional_uses_libs, " ")).
|
Textf(`optional_uses_library_names="%s"`, strings.Join(u.usesLibraryProperties.Optional_uses_libs, " ")).
|
||||||
Textf(`relax_check="%b"`, dexpreopt.GetGlobalConfig(ctx).RelaxUsesLibraryCheck).
|
Textf(`relax_check="%t"`, dexpreopt.GetGlobalConfig(ctx).RelaxUsesLibraryCheck).
|
||||||
Tool(android.PathForSource(ctx, "build/make/core/verify_uses_libraries.sh")).Input(apk).Output(statusFile)
|
Tool(android.PathForSource(ctx, "build/make/core/verify_uses_libraries.sh")).Input(apk).Output(statusFile)
|
||||||
rule.Command().Text("cp -f").Input(apk).Output(outputFile)
|
rule.Command().Text("cp -f").Input(apk).Output(outputFile)
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user