diff options
| author | 2020-07-15 04:01:45 +0000 | |
|---|---|---|
| committer | 2020-07-15 04:01:45 +0000 | |
| commit | 29936ae5a7c98a2df3bec299f3993e122a76d04c (patch) | |
| tree | 408ece1feb62945a91810d26b777cf22b4beb47f /android/sdk.go | |
| parent | 1e9c2677fdb3f1d615863d87c64ad9ea2fc9007b (diff) | |
Revert "Add compile_multilib properties to all native prebuilts."
This reverts commit 1e9c2677fdb3f1d615863d87c64ad9ea2fc9007b.
Reason for revert: Break build
Bug: 161315642
Change-Id: Ibf3d5e88412327e8f08d08272b75cd3df34a71e5
Diffstat (limited to 'android/sdk.go')
| -rw-r--r-- | android/sdk.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/android/sdk.go b/android/sdk.go index 2c38f564c..8115b690b 100644 --- a/android/sdk.go +++ b/android/sdk.go @@ -466,7 +466,8 @@ func RegisterSdkMemberType(memberType SdkMemberType) { // Base structure for all implementations of SdkMemberProperties. // -// Contains common properties that apply across many different member types. +// Contains common properties that apply across many different member types. These +// are not affected by the optimization to extract common values. type SdkMemberPropertiesBase struct { // The number of unique os types supported by the member variants. // @@ -488,7 +489,9 @@ type SdkMemberPropertiesBase struct { Os OsType `sdk:"keep"` // The setting to use for the compile_multilib property. - Compile_multilib string `android:"arch_variant"` + // + // This property is set after optimization so there is no point in trying to optimize it. + Compile_multilib string `sdk:"keep"` } // The os prefix to use for any file paths in the sdk. |