Fix strip_prefix flags to strip install paths.
Bug: 235331488 Test: m droid dist Change-Id: I3cd2af5d90e46a4c983728bc9b2d941d6ffda229 Merged-in: I3cd2af5d90e46a4c983728bc9b2d941d6ffda229
This commit is contained in:
@@ -107,6 +107,7 @@ func (s *sdkRepoHost) DepsMutator(ctx android.BottomUpMutatorContext) {
|
||||
|
||||
func (s *sdkRepoHost) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
||||
dir := android.PathForModuleOut(ctx, "zip")
|
||||
outputZipFile := dir.Join(ctx, "output.zip")
|
||||
builder := android.NewRuleBuilder(pctx, ctx).
|
||||
Sbox(dir, android.PathForModuleOut(ctx, "out.sbox.textproto")).
|
||||
SandboxInputs()
|
||||
@@ -123,7 +124,12 @@ func (s *sdkRepoHost) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
||||
s.CopySpecsToDir(ctx, builder, packageSpecs, dir)
|
||||
|
||||
noticeFile := android.PathForModuleOut(ctx, "NOTICES.txt")
|
||||
android.BuildNoticeTextOutputFromLicenseMetadata(ctx, noticeFile)
|
||||
android.BuildNoticeTextOutputFromLicenseMetadata(
|
||||
ctx, noticeFile, "", "",
|
||||
[]string{
|
||||
android.PathForModuleInstall(ctx, "sdk-repo").String() + "/",
|
||||
outputZipFile.String(),
|
||||
})
|
||||
builder.Command().Text("cp").
|
||||
Input(noticeFile).
|
||||
Text(filepath.Join(dir.String(), "NOTICE.txt"))
|
||||
@@ -209,7 +215,6 @@ func (s *sdkRepoHost) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
||||
}
|
||||
|
||||
// Zip up our temporary directory as the sdk-repo
|
||||
outputZipFile := dir.Join(ctx, "output.zip")
|
||||
builder.Command().
|
||||
BuiltTool("soong_zip").
|
||||
FlagWithOutput("-o ", outputZipFile).
|
||||
|
Reference in New Issue
Block a user