StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Add compile_multilib properties to all native prebuilts."

Browse Source 
This reverts commit 1e9c2677fd.

Reason for revert: Break build

Bug: 161315642
Change-Id: Ibf3d5e88412327e8f08d08272b75cd3df34a71e5
This commit is contained in:
Charles Chen
2020-07-15 04:01:45 +00:00
parent 1e9c2677fd
commit 29936ae5a7
4 changed files with 16 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
android/sdk.go
View File

@@ -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.