diff options
| author | Nan Zhang <nanzhang@google.com> | 2017-11-07 10:57:05 -0800 |
|---|---|---|
| committer | Nan Zhang <nanzhang@google.com> | 2017-11-07 15:57:16 -0800 |
| commit | 0007d810e2954dd544e7f36442cc0d7188f3c63a (patch) | |
| tree | a1c6ea7dc6a73e6b1c823e37cad29557208cb913 /cc/installer.go | |
| parent | 4647be4afe1dd6d0c4ce2da9e053f27d770216dd (diff) | |
| download | android_build_soong-0007d810e2954dd544e7f36442cc0d7188f3c63a.tar.gz android_build_soong-0007d810e2954dd544e7f36442cc0d7188f3c63a.tar.bz2 android_build_soong-0007d810e2954dd544e7f36442cc0d7188f3c63a.zip | |
Change bool, and string properties to *bool, and *string for cc
there's no use case for prepending/appending to bool, and string
properties within module struct. Declearing "*bool" and "*string" almost
cover everything user need.
I did see one case that user specify relative_install_path as
path prefix in cc_defaults, and concatenate with the one in real module
to get the final relative install path in Android.bp <bionic/tests/libs>.
Test: m -j checkbuild
Bug: b/68853585
Change-Id: If3a7a2689c3fc307aae136af6bc9c57f27a1e1a0
Diffstat (limited to 'cc/installer.go')
| -rw-r--r-- | cc/installer.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cc/installer.go b/cc/installer.go index 92076e50..33f29f27 100644 --- a/cc/installer.go +++ b/cc/installer.go @@ -24,7 +24,7 @@ import ( type InstallerProperties struct { // install to a subdirectory of the default install path for the module - Relative_install_path string `android:"arch_variant"` + Relative_install_path *string `android:"arch_variant"` } type installLocation int @@ -72,7 +72,8 @@ func (installer *baseInstaller) installDir(ctx ModuleContext) android.OutputPath if installer.location == InstallInData && ctx.useVndk() { dir = filepath.Join(dir, "vendor") } - return android.PathForModuleInstall(ctx, dir, installer.subDir, installer.Properties.Relative_install_path, installer.relative) + return android.PathForModuleInstall(ctx, dir, installer.subDir, + String(installer.Properties.Relative_install_path), installer.relative) } func (installer *baseInstaller) install(ctx ModuleContext, file android.Path) { |