diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-16 02:37:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-05-16 02:37:39 +0000 |
| commit | ff91b3c29a1bd461df1dd75688acd2ecf56d414c (patch) | |
| tree | 45ce2429baf3252ea3b6258397253eb5742f51ea /java/app.go | |
| parent | a91a16b4842cc1f745a754bf02933a4d337e79ed (diff) | |
| parent | 8cf307e75448df609101d23d7592b2baa36e5acd (diff) | |
| download | build_soong-ff91b3c29a1bd461df1dd75688acd2ecf56d414c.tar.gz build_soong-ff91b3c29a1bd461df1dd75688acd2ecf56d414c.tar.bz2 build_soong-ff91b3c29a1bd461df1dd75688acd2ecf56d414c.zip | |
Merge "Add apex_set module." into rvc-dev
Diffstat (limited to 'java/app.go')
| -rwxr-xr-x | java/app.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/app.go b/java/app.go index 9a922f3a..756203c5 100755 --- a/java/app.go +++ b/java/app.go @@ -96,16 +96,16 @@ func (as *AndroidAppSet) Privileged() bool { return Bool(as.properties.Privileged) } -var targetCpuAbi = map[string]string{ +var TargetCpuAbi = map[string]string{ "arm": "ARMEABI_V7A", "arm64": "ARM64_V8A", "x86": "X86", "x86_64": "X86_64", } -func supportedAbis(ctx android.ModuleContext) []string { +func SupportedAbis(ctx android.ModuleContext) []string { abiName := func(archVar string, deviceArch string) string { - if abi, found := targetCpuAbi[deviceArch]; found { + if abi, found := TargetCpuAbi[deviceArch]; found { return abi } ctx.ModuleErrorf("Invalid %s: %s", archVar, deviceArch) @@ -138,7 +138,7 @@ func (as *AndroidAppSet) GenerateAndroidBuildActions(ctx android.ModuleContext) Output: as.packedOutput, Inputs: android.Paths{as.prebuilt.SingleSourcePath(ctx)}, Args: map[string]string{ - "abis": strings.Join(supportedAbis(ctx), ","), + "abis": strings.Join(SupportedAbis(ctx), ","), "allow-prereleased": strconv.FormatBool(proptools.Bool(as.properties.Prerelease)), "screen-densities": screenDensities, "sdk-version": ctx.Config().PlatformSdkVersion(), |