StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "respect relative_install_path for binaries in APEXes"

Browse Source 
am: 1b7a4b0074

Change-Id: Iea11f82e57d44f4df30348412f520c3e32f2e109
This commit is contained in:
Jiyong Park
2019-03-19 15:02:41 -07:00
committed by android-build-merger
parent 542c4cb03f 1b7a4b0074
commit b6195afa0d
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apex/apex.go
View File

@@ -613,9 +613,7 @@ func getCopyManifestForNativeLibrary(cc *cc.Module, handleSpecialLibs bool) (fil
} }
func getCopyManifestForExecutable(cc *cc.Module) (fileToCopy android.Path, dirInApex string) { 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 = filepath.Join("bin", cc.RelativeInstallPath())
dirInApex = "bin"
fileToCopy = cc.OutputFile().Path() fileToCopy = cc.OutputFile().Path()
return return
} }

7
apex/apex_test.go
View File

@@ -696,10 +696,9 @@ func TestFilesInSubDir(t *testing.T) {
ensureListContains(t, dirs, "lib/foo") ensureListContains(t, dirs, "lib/foo")
ensureListContains(t, dirs, "lib/foo/bar") ensureListContains(t, dirs, "lib/foo/bar")
// TODO(b/123721777) respect relative path for binaries ensureListContains(t, dirs, "bin")
// ensureListContains(t, dirs, "bin") ensureListContains(t, dirs, "bin/foo")
// ensureListContains(t, dirs, "bin/foo") ensureListContains(t, dirs, "bin/foo/bar")
// ensureListContains(t, dirs, "bin/foo/bar")
} }
func TestUseVendor(t *testing.T) { func TestUseVendor(t *testing.T) {