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 /apex/prebuilt.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 'apex/prebuilt.go')
| -rw-r--r-- | apex/prebuilt.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apex/prebuilt.go b/apex/prebuilt.go index 187e0df09..03ee11ef5 100644 --- a/apex/prebuilt.go +++ b/apex/prebuilt.go @@ -24,6 +24,7 @@ import ( "android/soong/android" "android/soong/java" "android/soong/provenance" + "github.com/google/blueprint" "github.com/google/blueprint/proptools" ) @@ -817,6 +818,8 @@ func (p *prebuiltApexExtractorModule) GenerateAndroidBuildActions(ctx android.Mo } apexSet := android.SingleSourcePathFromSupplier(ctx, srcsSupplier, "set") p.extractedApex = android.PathForModuleOut(ctx, "extracted", apexSet.Base()) + // Filter out NativeBridge archs (b/260115309) + abis := java.SupportedAbis(ctx, true) ctx.Build(pctx, android.BuildParams{ Rule: extractMatchingApex, @@ -824,7 +827,7 @@ func (p *prebuiltApexExtractorModule) GenerateAndroidBuildActions(ctx android.Mo Inputs: android.Paths{apexSet}, Output: p.extractedApex, Args: map[string]string{ - "abis": strings.Join(java.SupportedAbis(ctx), ","), + "abis": strings.Join(abis, ","), "allow-prereleased": strconv.FormatBool(proptools.Bool(p.properties.Prerelease)), "sdk-version": ctx.Config().PlatformSdkVersion().String(), }, |