diff options
| author | Paul Duffin <paulduffin@google.com> | 2020-05-06 10:23:19 +0100 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2020-05-07 18:35:11 +0100 |
| commit | ee2096237846c1cae2835c77af4204f1a6ec30a3 (patch) | |
| tree | cbf288dcc4e266be091e10e7f92f9268794c6a63 /java/java.go | |
| parent | bd7e3295dd9a2fe372b6b78dfdac8382ce24ae1a (diff) | |
Detect invalid arch specific properties in snapshot
Previously, the snapshot code did not know whether a specific property
could be arch specific or not and assumed that they all were which
meant that it could generate snapshots containing arch specific values
for properties that are not arch specific and so would fail when
unpacked.
This change requires arch specific fields in SdkMemberProperties to be
tagged as such using `android:"arch_variant"` (just as in module input
property structures). Any property without that must have properties
that are common across all variants.
Bug: 155628860
Test: m nothing
Change-Id: Ifc8116e11d987cfe7aec2eeaa964f3bbf36b5dc2
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/java.go b/java/java.go index 472d3dac4..9d75c74c7 100644 --- a/java/java.go +++ b/java/java.go @@ -1906,7 +1906,7 @@ func (mt *librarySdkMemberType) CreateVariantPropertiesStruct() android.SdkMembe type librarySdkMemberProperties struct { android.SdkMemberPropertiesBase - JarToExport android.Path + JarToExport android.Path `android:"arch_variant"` AidlIncludeDirs android.Paths } |