diff options
| author | 2019-03-19 21:47:18 +0000 | |
|---|---|---|
| committer | 2019-03-19 21:47:18 +0000 | |
| commit | 1b7a4b00742fe7bcd22ae04e1b9eae2c01b3677c (patch) | |
| tree | 83d766f409e07231fd1103be9a850cd9e6a2fb00 | |
| parent | 8c84e60f38999454b050e6a613431dd062bf418d (diff) | |
| parent | bd13e446105ea87bac0a6f48f20f581a1ed871d9 (diff) | |
Merge "respect relative_install_path for binaries in APEXes"
| -rw-r--r-- | apex/apex.go | 4 | ||||
| -rw-r--r-- | apex/apex_test.go | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/apex/apex.go b/apex/apex.go index 341968bd4..a70a37be3 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -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 } diff --git a/apex/apex_test.go b/apex/apex_test.go index 5b767ef76..f221cf228 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -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) { |