Add sdk mutator for native modules
Compiling native modules against the NDK disables platform features like ASAN. For anything shipped on the system image there is no reason to compile against the NDK. Add a new mutator to Soong that creates a platform and an SDK variant for modules that set sdk_version, and ignore sdk_version for the platform variant. The SDK variant will be used for embedding in APKs that may be installed on older platforms. Apexes use their own variants that enforce backwards compatibility. Test: sdk_test.go Test: TestJNIPackaging Bug: 149591340 Change-Id: I7d72934aaee2e1326cc0ba5f29f51f14feec4521
This commit is contained in:
102
cc/sdk_test.go
Normal file
102
cc/sdk_test.go
Normal file
@@ -0,0 +1,102 @@
|
||||
// Copyright 2020 Google Inc. All rights reserved.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package cc
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"android/soong/android"
|
||||
)
|
||||
|
||||
func TestSdkMutator(t *testing.T) {
|
||||
bp := `
|
||||
cc_library {
|
||||
name: "libsdk",
|
||||
shared_libs: ["libsdkdep"],
|
||||
sdk_version: "current",
|
||||
stl: "c++_shared",
|
||||
}
|
||||
|
||||
cc_library {
|
||||
name: "libsdkdep",
|
||||
sdk_version: "current",
|
||||
stl: "c++_shared",
|
||||
}
|
||||
|
||||
cc_library {
|
||||
name: "libplatform",
|
||||
shared_libs: ["libsdk"],
|
||||
stl: "libc++",
|
||||
}
|
||||
|
||||
cc_binary {
|
||||
name: "platformbinary",
|
||||
shared_libs: ["libplatform"],
|
||||
stl: "libc++",
|
||||
}
|
||||
|
||||
cc_binary {
|
||||
name: "sdkbinary",
|
||||
shared_libs: ["libsdk"],
|
||||
sdk_version: "current",
|
||||
stl: "libc++",
|
||||
}
|
||||
`
|
||||
|
||||
assertDep := func(t *testing.T, from, to android.TestingModule) {
|
||||
t.Helper()
|
||||
found := false
|
||||
|
||||
var toFile android.Path
|
||||
m := to.Module().(*Module)
|
||||
if toc := m.Toc(); toc.Valid() {
|
||||
toFile = toc.Path()
|
||||
} else {
|
||||
toFile = m.outputFile.Path()
|
||||
}
|
||||
|
||||
rule := from.Description("link")
|
||||
for _, dep := range rule.Implicits {
|
||||
if dep.String() == toFile.String() {
|
||||
found = true
|
||||
}
|
||||
}
|
||||
if !found {
|
||||
t.Errorf("expected %q in %q", toFile.String(), rule.Implicits.Strings())
|
||||
}
|
||||
}
|
||||
|
||||
ctx := testCc(t, bp)
|
||||
|
||||
libsdkNDK := ctx.ModuleForTests("libsdk", "android_arm64_armv8-a_sdk_shared")
|
||||
libsdkPlatform := ctx.ModuleForTests("libsdk", "android_arm64_armv8-a_shared")
|
||||
libsdkdepNDK := ctx.ModuleForTests("libsdkdep", "android_arm64_armv8-a_sdk_shared")
|
||||
libsdkdepPlatform := ctx.ModuleForTests("libsdkdep", "android_arm64_armv8-a_shared")
|
||||
libplatform := ctx.ModuleForTests("libplatform", "android_arm64_armv8-a_shared")
|
||||
platformbinary := ctx.ModuleForTests("platformbinary", "android_arm64_armv8-a")
|
||||
sdkbinary := ctx.ModuleForTests("sdkbinary", "android_arm64_armv8-a_sdk")
|
||||
|
||||
libcxxNDK := ctx.ModuleForTests("ndk_libc++_shared", "android_arm64_armv8-a_sdk_shared")
|
||||
libcxxPlatform := ctx.ModuleForTests("libc++", "android_arm64_armv8-a_shared")
|
||||
|
||||
assertDep(t, libsdkNDK, libsdkdepNDK)
|
||||
assertDep(t, libsdkPlatform, libsdkdepPlatform)
|
||||
assertDep(t, libplatform, libsdkPlatform)
|
||||
assertDep(t, platformbinary, libplatform)
|
||||
assertDep(t, sdkbinary, libsdkNDK)
|
||||
|
||||
assertDep(t, libsdkNDK, libcxxNDK)
|
||||
assertDep(t, libsdkPlatform, libcxxPlatform)
|
||||
}
|
Reference in New Issue
Block a user