Build against SDKs for native libs only for unbundled apps.
Unbundled APEX modules need to access the platform variant (i.e. sdk:"") since it's there that the versioned stubs are exposed. Test: m SOONG_ALLOW_MISSING_DEPENDENCIES=true \ TARGET_BUILD_UNBUNDLED=true toybox on master-art with prebuilt Runtime (Bionic) APEX SDK. The prebuilt SDK doesn't have libc.ndk.xxx etc, which e.g. libcrypto would depend on without this CL, since it specifies sdk_version. Bug: 157549171 Change-Id: I3095e42beb2b48421bfb81be942cc2ac30405fd0
This commit is contained in:
@@ -41,7 +41,7 @@ func sdkMutator(ctx android.BottomUpMutatorContext) {
|
||||
modules[0].(*Module).Properties.Sdk_version = nil
|
||||
modules[1].(*Module).Properties.IsSdkVariant = true
|
||||
|
||||
if ctx.Config().UnbundledBuild() {
|
||||
if ctx.Config().UnbundledBuildApps() {
|
||||
modules[0].(*Module).Properties.HideFromMake = true
|
||||
modules[0].(*Module).Properties.PreventInstall = true
|
||||
} else {
|
||||
|
Reference in New Issue
Block a user