diff options
author | Greg Kaiser <gkaiser@google.com> | 2020-05-08 19:18:40 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-05-08 19:18:40 +0000 |
commit | a71fe150fa4d9535549a7d9cb63db91c7332eb8a (patch) | |
tree | 02f7ecec8c181a5788aa947d5231b7be86aa2b3c /java/java.go | |
parent | 50fc599bbc01cf623efa2bed9f98e9e0f2e30fe6 (diff) | |
parent | e509447c9348f5dbfc29393665d74caab9ad22c6 (diff) |
Merge changes from topic "revert-1302576-NGVCIVIIJO"
* changes:
Revert "Detect invalid arch specific properties in snapshot"
Revert "Adds support for 'ignored-on-host'"
Revert "Fix snapshot of a host/device cc_library with stubs"
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 9d75c74c7..472d3dac4 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 `android:"arch_variant"` + JarToExport android.Path AidlIncludeDirs android.Paths } |