diff options
| author | alk3pInjection <webmaster@raspii.tech> | 2023-07-04 20:04:45 +0800 |
|---|---|---|
| committer | alk3pInjection <webmaster@raspii.tech> | 2023-07-04 20:04:45 +0800 |
| commit | 18daee1bb6b840a9be3011b4c134b2d78fe79758 (patch) | |
| tree | bfd29fcc53f57c5cd61bd48b0820ce9a49735868 /java/app_set.go | |
| parent | 923de58d67f7706e390551aa39c3c200100508b3 (diff) | |
| parent | 84623162fc09387696f9587d859ee6f3f03d75cd (diff) | |
Merge tag 'LA.QSSI.13.0.r1-10700-qssi.0' into tachibana-mr1tachibana-mr1
"LA.QSSI.13.0.r1-10700-qssi.0"
Conflicts:
ui/build/dumpvars.go
Change-Id: I78c34da9d4eb1cd233b776d6fab952f912439d5c
Diffstat (limited to 'java/app_set.go')
| -rw-r--r-- | java/app_set.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/java/app_set.go b/java/app_set.go index 694b1670e..defb4cbf7 100644 --- a/java/app_set.go +++ b/java/app_set.go @@ -96,7 +96,7 @@ var TargetCpuAbi = map[string]string{ "x86_64": "X86_64", } -func SupportedAbis(ctx android.ModuleContext) []string { +func SupportedAbis(ctx android.ModuleContext, excludeNativeBridgeAbis bool) []string { abiName := func(targetIdx int, deviceArch string) string { if abi, found := TargetCpuAbi[deviceArch]; found { return abi @@ -107,6 +107,9 @@ func SupportedAbis(ctx android.ModuleContext) []string { var result []string for i, target := range ctx.Config().Targets[android.Android] { + if target.NativeBridge == android.NativeBridgeEnabled && excludeNativeBridgeAbis { + continue + } result = append(result, abiName(i, target.Arch.ArchType.String())) } return result @@ -133,7 +136,7 @@ func (as *AndroidAppSet) GenerateAndroidBuildActions(ctx android.ModuleContext) ImplicitOutputs: android.WritablePaths{as.packedOutput, as.apkcertsFile}, Inputs: android.Paths{as.prebuilt.SingleSourcePath(ctx)}, Args: map[string]string{ - "abis": strings.Join(SupportedAbis(ctx), ","), + "abis": strings.Join(SupportedAbis(ctx, false), ","), "allow-prereleased": strconv.FormatBool(proptools.Bool(as.properties.Prerelease)), "screen-densities": screenDensities, "sdk-version": ctx.Config().PlatformSdkVersion().String(), |