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

Merge changes from topic "sdk_version_variant" into rvc-dev

Browse Source 
* changes:
  Add sdk mutator for native modules
  Require apps built against the SDK to use JNI built against the NDK
This commit is contained in:
Colin Cross
2020-05-02 01:41:18 +00:00
committed by Android (Google) Code Review
parent da831ae8a8 01fd7ccbc7
commit 2a5fb91370
20 changed files with 423 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apex/apex_test.go
View File

@@ -3323,18 +3323,20 @@ func TestApexWithApps(t *testing.T) {
android_app {
name: "AppFoo",
srcs: ["foo/bar/MyClass.java"],
sdk_version: "none",
sdk_version: "current",
system_modules: "none",
jni_libs: ["libjni"],
stl: "none",
apex_available: [ "myapex" ],
}
android_app {
name: "AppFooPriv",
srcs: ["foo/bar/MyClass.java"],
sdk_version: "none",
sdk_version: "current",
system_modules: "none",
privileged: true,
stl: "none",
apex_available: [ "myapex" ],
}
@@ -3371,7 +3373,7 @@ func TestApexWithApps(t *testing.T) {
}
// JNI libraries including transitive deps are
for _, jni := range []string{"libjni", "libfoo"} {
jniOutput := ctx.ModuleForTests(jni, "android_arm64_armv8-a_shared_myapex").Module().(*cc.Module).OutputFile()
jniOutput := ctx.ModuleForTests(jni, "android_arm64_armv8-a_sdk_shared_myapex").Module().(*cc.Module).OutputFile()
// ... embedded inside APK (jnilibs.zip)
ensureListContains(t, appZipRule.Implicits.Strings(), jniOutput.String())
// ... and not directly inside the APEX