diff options
| author | Colin Cross <ccross@android.com> | 2017-11-29 00:27:14 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-11-30 00:44:18 +0000 |
| commit | 6510f91a1c8a40b6b06d382792d4da1a72eb1118 (patch) | |
| tree | 4511e4f6ee6f7d43d03b7489ede41b6f22b2a559 /cc/ndk_library.go | |
| parent | aabf67968c4abc98d94bd8ccd6d612246b2fbbdc (diff) | |
| download | build_soong-6510f91a1c8a40b6b06d382792d4da1a72eb1118.tar.gz build_soong-6510f91a1c8a40b6b06d382792d4da1a72eb1118.tar.bz2 build_soong-6510f91a1c8a40b6b06d382792d4da1a72eb1118.zip | |
Replace ModuleContext.AConfig() with Config()
AConfig() now duplicates Config(). Replace the uses of AConfig()
with Config(). Leave AConfig() for now until code in other
projects is cleaned up.
Test: m checkbuild
Change-Id: Ic88be643049d21dba45dbd1a65588ed94bf43bdc
Diffstat (limited to 'cc/ndk_library.go')
| -rw-r--r-- | cc/ndk_library.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cc/ndk_library.go b/cc/ndk_library.go index e69128c4..459d9808 100644 --- a/cc/ndk_library.go +++ b/cc/ndk_library.go @@ -117,7 +117,7 @@ func normalizeNdkApiLevel(ctx android.BaseContext, apiLevel string, return apiLevel, nil } - minVersion := ctx.AConfig().MinSupportedSdkVersion() + minVersion := ctx.Config().MinSupportedSdkVersion() firstArchVersions := map[android.ArchType]int{ android.Arm: minVersion, android.Arm64: 21, @@ -188,7 +188,7 @@ func shouldUseVersionScript(stub *stubDecorator) (bool, error) { } func generateStubApiVariants(mctx android.BottomUpMutatorContext, c *stubDecorator) { - platformVersion := mctx.AConfig().PlatformSdkVersionInt() + platformVersion := mctx.Config().PlatformSdkVersionInt() firstSupportedVersion, err := normalizeNdkApiLevel(mctx, String(c.properties.First_version), mctx.Arch()) @@ -207,7 +207,7 @@ func generateStubApiVariants(mctx android.BottomUpMutatorContext, c *stubDecorat for version := firstGenVersion; version <= platformVersion; version++ { versionStrs = append(versionStrs, strconv.Itoa(version)) } - versionStrs = append(versionStrs, mctx.AConfig().PlatformVersionActiveCodenames()...) + versionStrs = append(versionStrs, mctx.Config().PlatformVersionActiveCodenames()...) versionStrs = append(versionStrs, "current") modules := mctx.CreateVariations(versionStrs...) |