Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b7a4b00 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "respect relative_install_path for binaries in APEXes"

parents 8c84e60f bd13e446

apex/apex.go

+1 −3
Original line number Diff line number Diff line
@@ -613,9 +613,7 @@ func getCopyManifestForNativeLibrary(cc *cc.Module, handleSpecialLibs bool) (fil 
}



func getCopyManifestForExecutable(cc *cc.Module) (fileToCopy android.Path, dirInApex string) {

	// TODO(b/123721777) respect relative_install_path also for binaries

	// dirInApex = filepath.Join("bin", cc.RelativeInstallPath())

	dirInApex = "bin"

	dirInApex = filepath.Join("bin", cc.RelativeInstallPath())

	fileToCopy = cc.OutputFile().Path()

	return

}

apex/apex_test.go

+3 −4
Original line number Diff line number Diff line
@@ -696,10 +696,9 @@ func TestFilesInSubDir(t *testing.T) { 
	ensureListContains(t, dirs, "lib/foo")

	ensureListContains(t, dirs, "lib/foo/bar")



	// TODO(b/123721777) respect relative path for binaries

	// ensureListContains(t, dirs, "bin")

	// ensureListContains(t, dirs, "bin/foo")

	// ensureListContains(t, dirs, "bin/foo/bar")

	ensureListContains(t, dirs, "bin")

	ensureListContains(t, dirs, "bin/foo")

	ensureListContains(t, dirs, "bin/foo/bar")

}



func TestUseVendor(t *testing.T) {