diff options
| author | Jiyong Park <jiyong@google.com> | 2019-03-15 18:10:35 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2019-03-18 14:49:21 +0900 |
| commit | bd13e446105ea87bac0a6f48f20f581a1ed871d9 (patch) | |
| tree | c00a377070e1cd6bdf8cdeeb5b0178eb4eb23b7a /apex | |
| parent | cd2e52870a89494eb0105d77e2977ac259de4a0a (diff) | |
| download | build_soong-bd13e446105ea87bac0a6f48f20f581a1ed871d9.tar.gz build_soong-bd13e446105ea87bac0a6f48f20f581a1ed871d9.tar.bz2 build_soong-bd13e446105ea87bac0a6f48f20f581a1ed871d9.zip | |
respect relative_install_path for binaries in APEXes
Bug: 123721777
Test: m (apex_test.go has the test)
Change-Id: I89bc83d4bc6fe8dc374cf36e06e795c75b290844
Diffstat (limited to 'apex')
| -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 341968bd..a70a37be 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 5b767ef7..f221cf22 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) { |