diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2018-03-12 15:30:26 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2018-04-11 01:45:14 +0000 |
| commit | 3fb1faeeb98143e132ca4d6f1cac42d6f060888b (patch) | |
| tree | b4c20c42a739b22d472b8d23ebf8189597e77c93 /cc/makevars.go | |
| parent | 47f98af97fdf6d8d294d5f1173abcf189c21acd5 (diff) | |
| download | soong-3fb1faeeb98143e132ca4d6f1cac42d6f060888b.tar.gz | |
Use Config/DeviceConfig functions to access ProductVariables
An upcoming change will stop exporting ProductVariables from Config, so
switch to using existing accessor functions, and add more when they're
missing.
Bug: 76168832
Test: out/soong/build.ninja is identical
Change-Id: Ie0135bdbd2df3258ef3ddb53e5f8fc00aa9b97f7
Diffstat (limited to 'cc/makevars.go')
| -rw-r--r-- | cc/makevars.go | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/cc/makevars.go b/cc/makevars.go index 2664ee19d..83a662f71 100644 --- a/cc/makevars.go +++ b/cc/makevars.go @@ -89,11 +89,7 @@ func makeVarsProvider(ctx android.MakeVarsContext) { ctx.Strict("GLOBAL_CLANG_CPPFLAGS_NO_OVERRIDE", "") ctx.Strict("NDK_PREBUILT_SHARED_LIBRARIES", strings.Join(ndkPrebuiltSharedLibs, " ")) - if ctx.Config().ProductVariables.DeviceVndkVersion != nil { - ctx.Strict("BOARD_VNDK_VERSION", *ctx.Config().ProductVariables.DeviceVndkVersion) - } else { - ctx.Strict("BOARD_VNDK_VERSION", "") - } + ctx.Strict("BOARD_VNDK_VERSION", ctx.DeviceConfig().VndkVersion()) ctx.Strict("VNDK_CORE_LIBRARIES", strings.Join(vndkCoreLibraries, " ")) ctx.Strict("VNDK_SAMEPROCESS_LIBRARIES", strings.Join(vndkSpLibraries, " ")) @@ -211,7 +207,7 @@ func makeVarsToolchain(ctx android.MakeVarsContext, secondPrefix string, hod = "Device" } - if target.Os.Class == android.Host && Bool(ctx.Config().ProductVariables.HostStaticBinaries) { + if target.Os.Class == android.Host && ctx.Config().HostStaticBinaries() { productExtraLdflags += "-static" } |