Replace AConfig() with Config() am: f339eb4319 am: ec007d2ff0 Original change: https://android-review.googlesource.com/c/platform/external/ComputeLibrary/+/3008718 Change-Id: I24e49c247d8d5d3fb9ba77e07d1cbdd6a4702404 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/scripts/arm_compute_library_nn_driver.go b/scripts/arm_compute_library_nn_driver.go index cbcd60e..db3dcc2 100644 --- a/scripts/arm_compute_library_nn_driver.go +++ b/scripts/arm_compute_library_nn_driver.go
@@ -33,13 +33,13 @@ func globalFlags(ctx android.BaseContext) []string { var cppflags []string - if ctx.AConfig().PlatformVersionName() == "Q" || ctx.AConfig().PlatformVersionName() == "10" || - ctx.AConfig().PlatformVersionName() == "R" || ctx.AConfig().PlatformVersionName() == "11" || - ctx.AConfig().PlatformVersionName() == "S" || ctx.AConfig().PlatformVersionName() == "12" { + if ctx.Config().PlatformVersionName() == "Q" || ctx.Config().PlatformVersionName() == "10" || + ctx.Config().PlatformVersionName() == "R" || ctx.Config().PlatformVersionName() == "11" || + ctx.Config().PlatformVersionName() == "S" || ctx.Config().PlatformVersionName() == "12" { cppflags = append(cppflags, "-fno-addrsig") } - if ctx.AConfig().PlatformVersionName() == "R" || ctx.AConfig().PlatformVersionName() == "11" { + if ctx.Config().PlatformVersionName() == "R" || ctx.Config().PlatformVersionName() == "11" { for _, a := range ctx.DeviceConfig().Arches() { theArch := a.ArchType.String() if theArch == "armv8-2a" { @@ -49,7 +49,7 @@ } } - data_types := strings.Split(ctx.AConfig().GetenvWithDefault("COMPUTE_LIB_DATA_TYPE", "ALL"), ",") + data_types := strings.Split(ctx.Config().GetenvWithDefault("COMPUTE_LIB_DATA_TYPE", "ALL"), ",") for _, x := range data_types { if strings.ToUpper(x) == "ALL" || strings.ToUpper(x) == "INTEGER" { @@ -75,7 +75,7 @@ } } - data_layouts := strings.Split(ctx.AConfig().GetenvWithDefault("COMPUTE_LIB_DATA_LAYOUT", "ALL"), ",") + data_layouts := strings.Split(ctx.Config().GetenvWithDefault("COMPUTE_LIB_DATA_LAYOUT", "ALL"), ",") for _, x := range data_layouts { if strings.ToUpper(x) == "ALL" || strings.ToUpper(x) == "NHWC" {