Disable all host OS variants except those explicitly included.
Necessary to avoid problems with implicitly enabled host OS'es, e.g. linux_glibc getting enabled when we only supply a linux_bionic linker in runtime-module-host-exports. That will then cause a non-functional prebuilt to take precedence over source if the prebuilt is preferred. We don't do this for device since we so far only support a single device OS (android). This introduces the notion that SDK member types can be host OS dependent or not. That way java members with host prebuilts don't get restricted to a specific host OS. Test: m nothing Test: build/soong/scripts/build-aml-prebuilts.sh runtime-module-host-exports Check that the generated Android.bp correctly disables the bionic linker prebuilt for linux_glibc. Test: art/build/apex/runtests.sh on master-art with an updated runtime SDK snapshot Test: art/tools/buildbot-build.sh {--host,--target} on master-art with an updated runtime SDK snapshot Bug: 160349757 Change-Id: Idad7ef138cdbcbd209d390bf6c10ca8365d4619f
This commit is contained in:
@@ -29,7 +29,8 @@ func init() {
|
||||
|
||||
var ccBinarySdkMemberType = &binarySdkMemberType{
|
||||
SdkMemberTypeBase: android.SdkMemberTypeBase{
|
||||
PropertyName: "native_binaries",
|
||||
PropertyName: "native_binaries",
|
||||
HostOsDependent: true,
|
||||
},
|
||||
}
|
||||
|
||||
|
@@ -25,8 +25,9 @@ func init() {
|
||||
|
||||
var headersLibrarySdkMemberType = &librarySdkMemberType{
|
||||
SdkMemberTypeBase: android.SdkMemberTypeBase{
|
||||
PropertyName: "native_header_libs",
|
||||
SupportsSdk: true,
|
||||
PropertyName: "native_header_libs",
|
||||
SupportsSdk: true,
|
||||
HostOsDependent: true,
|
||||
},
|
||||
prebuiltModuleType: "cc_prebuilt_library_headers",
|
||||
noOutputFiles: true,
|
||||
|
@@ -27,8 +27,9 @@ import (
|
||||
|
||||
var sharedLibrarySdkMemberType = &librarySdkMemberType{
|
||||
SdkMemberTypeBase: android.SdkMemberTypeBase{
|
||||
PropertyName: "native_shared_libs",
|
||||
SupportsSdk: true,
|
||||
PropertyName: "native_shared_libs",
|
||||
SupportsSdk: true,
|
||||
HostOsDependent: true,
|
||||
},
|
||||
prebuiltModuleType: "cc_prebuilt_library_shared",
|
||||
linkTypes: []string{"shared"},
|
||||
@@ -36,8 +37,9 @@ var sharedLibrarySdkMemberType = &librarySdkMemberType{
|
||||
|
||||
var staticLibrarySdkMemberType = &librarySdkMemberType{
|
||||
SdkMemberTypeBase: android.SdkMemberTypeBase{
|
||||
PropertyName: "native_static_libs",
|
||||
SupportsSdk: true,
|
||||
PropertyName: "native_static_libs",
|
||||
SupportsSdk: true,
|
||||
HostOsDependent: true,
|
||||
},
|
||||
prebuiltModuleType: "cc_prebuilt_library_static",
|
||||
linkTypes: []string{"static"},
|
||||
@@ -45,8 +47,9 @@ var staticLibrarySdkMemberType = &librarySdkMemberType{
|
||||
|
||||
var staticAndSharedLibrarySdkMemberType = &librarySdkMemberType{
|
||||
SdkMemberTypeBase: android.SdkMemberTypeBase{
|
||||
PropertyName: "native_libs",
|
||||
SupportsSdk: true,
|
||||
PropertyName: "native_libs",
|
||||
SupportsSdk: true,
|
||||
HostOsDependent: true,
|
||||
},
|
||||
prebuiltModuleType: "cc_prebuilt_library",
|
||||
linkTypes: []string{"static", "shared"},
|
||||
|
Reference in New Issue
Block a user