f78a890183
Context - Android-<target>.mk currently does not contain information about partition for its dependent unembedded jni libraries, but only lists the name of the unembedded jni libraries. - If an android_app module depends on an unembedded jni library that is located in a different partition, make cannot find the library. Implementation - Create a string field partition in jniLib struct. - Add variable "LOCAL_SOONG_JNI_LIBS_PARTITION_<target>", an array of mappings of the name of the jni library to its partition. Bug: 154162945 Test: m Change-Id: I6b8e1272ff59dc70e3dd6ce8c6c8e4686dad76df
403 lines
11 KiB
Go
403 lines
11 KiB
Go
// Copyright 2019 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 java
|
|
|
|
import (
|
|
"reflect"
|
|
"testing"
|
|
|
|
"android/soong/android"
|
|
"android/soong/cc"
|
|
|
|
"github.com/google/blueprint/proptools"
|
|
)
|
|
|
|
func TestRequired(t *testing.T) {
|
|
ctx, _ := testJava(t, `
|
|
java_library {
|
|
name: "foo",
|
|
srcs: ["a.java"],
|
|
required: ["libfoo"],
|
|
}
|
|
`)
|
|
|
|
mod := ctx.ModuleForTests("foo", "android_common").Module()
|
|
entries := android.AndroidMkEntriesForTest(t, ctx, mod)[0]
|
|
|
|
expected := []string{"libfoo"}
|
|
actual := entries.EntryMap["LOCAL_REQUIRED_MODULES"]
|
|
if !reflect.DeepEqual(expected, actual) {
|
|
t.Errorf("Unexpected required modules - expected: %q, actual: %q", expected, actual)
|
|
}
|
|
}
|
|
|
|
func TestHostdex(t *testing.T) {
|
|
ctx, _ := testJava(t, `
|
|
java_library {
|
|
name: "foo",
|
|
srcs: ["a.java"],
|
|
hostdex: true,
|
|
}
|
|
`)
|
|
|
|
mod := ctx.ModuleForTests("foo", "android_common").Module()
|
|
entriesList := android.AndroidMkEntriesForTest(t, ctx, mod)
|
|
if len(entriesList) != 2 {
|
|
t.Errorf("two entries are expected, but got %d", len(entriesList))
|
|
}
|
|
|
|
mainEntries := &entriesList[0]
|
|
expected := []string{"foo"}
|
|
actual := mainEntries.EntryMap["LOCAL_MODULE"]
|
|
if !reflect.DeepEqual(expected, actual) {
|
|
t.Errorf("Unexpected module name - expected: %q, actual: %q", expected, actual)
|
|
}
|
|
|
|
subEntries := &entriesList[1]
|
|
expected = []string{"foo-hostdex"}
|
|
actual = subEntries.EntryMap["LOCAL_MODULE"]
|
|
if !reflect.DeepEqual(expected, actual) {
|
|
t.Errorf("Unexpected module name - expected: %q, actual: %q", expected, actual)
|
|
}
|
|
}
|
|
|
|
func TestHostdexRequired(t *testing.T) {
|
|
ctx, _ := testJava(t, `
|
|
java_library {
|
|
name: "foo",
|
|
srcs: ["a.java"],
|
|
hostdex: true,
|
|
required: ["libfoo"],
|
|
}
|
|
`)
|
|
|
|
mod := ctx.ModuleForTests("foo", "android_common").Module()
|
|
entriesList := android.AndroidMkEntriesForTest(t, ctx, mod)
|
|
if len(entriesList) != 2 {
|
|
t.Errorf("two entries are expected, but got %d", len(entriesList))
|
|
}
|
|
|
|
mainEntries := &entriesList[0]
|
|
expected := []string{"libfoo"}
|
|
actual := mainEntries.EntryMap["LOCAL_REQUIRED_MODULES"]
|
|
if !reflect.DeepEqual(expected, actual) {
|
|
t.Errorf("Unexpected required modules - expected: %q, actual: %q", expected, actual)
|
|
}
|
|
|
|
subEntries := &entriesList[1]
|
|
expected = []string{"libfoo"}
|
|
actual = subEntries.EntryMap["LOCAL_REQUIRED_MODULES"]
|
|
if !reflect.DeepEqual(expected, actual) {
|
|
t.Errorf("Unexpected required modules - expected: %q, actual: %q", expected, actual)
|
|
}
|
|
}
|
|
|
|
func TestHostdexSpecificRequired(t *testing.T) {
|
|
ctx, _ := testJava(t, `
|
|
java_library {
|
|
name: "foo",
|
|
srcs: ["a.java"],
|
|
hostdex: true,
|
|
target: {
|
|
hostdex: {
|
|
required: ["libfoo"],
|
|
},
|
|
},
|
|
}
|
|
`)
|
|
|
|
mod := ctx.ModuleForTests("foo", "android_common").Module()
|
|
entriesList := android.AndroidMkEntriesForTest(t, ctx, mod)
|
|
if len(entriesList) != 2 {
|
|
t.Errorf("two entries are expected, but got %d", len(entriesList))
|
|
}
|
|
|
|
mainEntries := &entriesList[0]
|
|
if r, ok := mainEntries.EntryMap["LOCAL_REQUIRED_MODULES"]; ok {
|
|
t.Errorf("Unexpected required modules: %q", r)
|
|
}
|
|
|
|
subEntries := &entriesList[1]
|
|
expected := []string{"libfoo"}
|
|
actual := subEntries.EntryMap["LOCAL_REQUIRED_MODULES"]
|
|
if !reflect.DeepEqual(expected, actual) {
|
|
t.Errorf("Unexpected required modules - expected: %q, actual: %q", expected, actual)
|
|
}
|
|
}
|
|
|
|
func TestJavaSdkLibrary_RequireXmlPermissionFile(t *testing.T) {
|
|
result := android.GroupFixturePreparers(
|
|
prepareForJavaTest,
|
|
PrepareForTestWithJavaSdkLibraryFiles,
|
|
FixtureWithLastReleaseApis("foo-shared_library", "foo-no_shared_library"),
|
|
).RunTestWithBp(t, `
|
|
java_sdk_library {
|
|
name: "foo-shared_library",
|
|
srcs: ["a.java"],
|
|
}
|
|
java_sdk_library {
|
|
name: "foo-no_shared_library",
|
|
srcs: ["a.java"],
|
|
shared_library: false,
|
|
}
|
|
`)
|
|
|
|
// Verify the existence of internal modules
|
|
result.ModuleForTests("foo-shared_library.xml", "android_common")
|
|
|
|
testCases := []struct {
|
|
moduleName string
|
|
expected []string
|
|
}{
|
|
{"foo-shared_library", []string{"foo-shared_library.xml"}},
|
|
{"foo-no_shared_library", nil},
|
|
}
|
|
for _, tc := range testCases {
|
|
mod := result.ModuleForTests(tc.moduleName, "android_common").Module()
|
|
entries := android.AndroidMkEntriesForTest(t, result.TestContext, mod)[0]
|
|
actual := entries.EntryMap["LOCAL_REQUIRED_MODULES"]
|
|
if !reflect.DeepEqual(tc.expected, actual) {
|
|
t.Errorf("Unexpected required modules - expected: %q, actual: %q", tc.expected, actual)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestImportSoongDexJar(t *testing.T) {
|
|
result := PrepareForTestWithJavaDefaultModules.RunTestWithBp(t, `
|
|
java_import {
|
|
name: "my-java-import",
|
|
jars: ["a.jar"],
|
|
prefer: true,
|
|
compile_dex: true,
|
|
}
|
|
`)
|
|
|
|
mod := result.Module("my-java-import", "android_common")
|
|
entries := android.AndroidMkEntriesForTest(t, result.TestContext, mod)[0]
|
|
expectedSoongDexJar := "out/soong/.intermediates/my-java-import/android_common/dex/my-java-import.jar"
|
|
actualSoongDexJar := entries.EntryMap["LOCAL_SOONG_DEX_JAR"]
|
|
|
|
android.AssertStringPathsRelativeToTopEquals(t, "LOCAL_SOONG_DEX_JAR", result.Config, []string{expectedSoongDexJar}, actualSoongDexJar)
|
|
}
|
|
|
|
func TestAndroidTestHelperApp_LocalDisableTestConfig(t *testing.T) {
|
|
ctx, _ := testJava(t, `
|
|
android_test_helper_app {
|
|
name: "foo",
|
|
srcs: ["a.java"],
|
|
}
|
|
`)
|
|
|
|
mod := ctx.ModuleForTests("foo", "android_common").Module()
|
|
entries := android.AndroidMkEntriesForTest(t, ctx, mod)[0]
|
|
|
|
expected := []string{"true"}
|
|
actual := entries.EntryMap["LOCAL_DISABLE_TEST_CONFIG"]
|
|
if !reflect.DeepEqual(expected, actual) {
|
|
t.Errorf("Unexpected flag value - expected: %q, actual: %q", expected, actual)
|
|
}
|
|
}
|
|
|
|
func TestGetOverriddenPackages(t *testing.T) {
|
|
ctx, _ := testJava(
|
|
t, `
|
|
android_app {
|
|
name: "foo",
|
|
srcs: ["a.java"],
|
|
sdk_version: "current",
|
|
overrides: ["qux"]
|
|
}
|
|
|
|
override_android_app {
|
|
name: "foo_override",
|
|
base: "foo",
|
|
overrides: ["bar"]
|
|
}
|
|
`)
|
|
|
|
expectedVariants := []struct {
|
|
name string
|
|
moduleName string
|
|
variantName string
|
|
overrides []string
|
|
}{
|
|
{
|
|
name: "foo",
|
|
moduleName: "foo",
|
|
variantName: "android_common",
|
|
overrides: []string{"qux"},
|
|
},
|
|
{
|
|
name: "foo",
|
|
moduleName: "foo_override",
|
|
variantName: "android_common_foo_override",
|
|
overrides: []string{"bar", "foo"},
|
|
},
|
|
}
|
|
|
|
for _, expected := range expectedVariants {
|
|
mod := ctx.ModuleForTests(expected.name, expected.variantName).Module()
|
|
entries := android.AndroidMkEntriesForTest(t, ctx, mod)[0]
|
|
actual := entries.EntryMap["LOCAL_OVERRIDES_PACKAGES"]
|
|
|
|
android.AssertDeepEquals(t, "overrides property", expected.overrides, actual)
|
|
}
|
|
}
|
|
|
|
func TestJniPartition(t *testing.T) {
|
|
bp := `
|
|
cc_library {
|
|
name: "libjni_system",
|
|
system_shared_libs: [],
|
|
sdk_version: "current",
|
|
stl: "none",
|
|
}
|
|
|
|
cc_library {
|
|
name: "libjni_system_ext",
|
|
system_shared_libs: [],
|
|
sdk_version: "current",
|
|
stl: "none",
|
|
system_ext_specific: true,
|
|
}
|
|
|
|
cc_library {
|
|
name: "libjni_odm",
|
|
system_shared_libs: [],
|
|
sdk_version: "current",
|
|
stl: "none",
|
|
device_specific: true,
|
|
}
|
|
|
|
cc_library {
|
|
name: "libjni_product",
|
|
system_shared_libs: [],
|
|
sdk_version: "current",
|
|
stl: "none",
|
|
product_specific: true,
|
|
}
|
|
|
|
cc_library {
|
|
name: "libjni_vendor",
|
|
system_shared_libs: [],
|
|
sdk_version: "current",
|
|
stl: "none",
|
|
soc_specific: true,
|
|
}
|
|
|
|
android_app {
|
|
name: "test_app_system_jni_system",
|
|
privileged: true,
|
|
platform_apis: true,
|
|
certificate: "platform",
|
|
jni_libs: ["libjni_system"],
|
|
}
|
|
|
|
android_app {
|
|
name: "test_app_system_jni_system_ext",
|
|
privileged: true,
|
|
platform_apis: true,
|
|
certificate: "platform",
|
|
jni_libs: ["libjni_system_ext"],
|
|
}
|
|
|
|
android_app {
|
|
name: "test_app_system_ext_jni_system",
|
|
privileged: true,
|
|
platform_apis: true,
|
|
certificate: "platform",
|
|
jni_libs: ["libjni_system"],
|
|
system_ext_specific: true
|
|
}
|
|
|
|
android_app {
|
|
name: "test_app_system_ext_jni_system_ext",
|
|
sdk_version: "core_platform",
|
|
jni_libs: ["libjni_system_ext"],
|
|
system_ext_specific: true
|
|
}
|
|
|
|
android_app {
|
|
name: "test_app_product_jni_product",
|
|
sdk_version: "core_platform",
|
|
jni_libs: ["libjni_product"],
|
|
product_specific: true
|
|
}
|
|
|
|
android_app {
|
|
name: "test_app_vendor_jni_odm",
|
|
sdk_version: "core_platform",
|
|
jni_libs: ["libjni_odm"],
|
|
soc_specific: true
|
|
}
|
|
|
|
android_app {
|
|
name: "test_app_odm_jni_vendor",
|
|
sdk_version: "core_platform",
|
|
jni_libs: ["libjni_vendor"],
|
|
device_specific: true
|
|
}
|
|
android_app {
|
|
name: "test_app_system_jni_multiple",
|
|
privileged: true,
|
|
platform_apis: true,
|
|
certificate: "platform",
|
|
jni_libs: ["libjni_system", "libjni_system_ext"],
|
|
}
|
|
android_app {
|
|
name: "test_app_vendor_jni_multiple",
|
|
sdk_version: "core_platform",
|
|
jni_libs: ["libjni_odm", "libjni_vendor"],
|
|
soc_specific: true
|
|
}
|
|
`
|
|
arch := "arm64"
|
|
ctx := android.GroupFixturePreparers(
|
|
PrepareForTestWithJavaDefaultModules,
|
|
cc.PrepareForTestWithCcDefaultModules,
|
|
android.PrepareForTestWithAndroidMk,
|
|
android.FixtureModifyConfig(func(config android.Config) {
|
|
config.TestProductVariables.DeviceArch = proptools.StringPtr(arch)
|
|
}),
|
|
).
|
|
RunTestWithBp(t, bp)
|
|
testCases := []struct {
|
|
name string
|
|
partitionNames []string
|
|
partitionTags []string
|
|
}{
|
|
{"test_app_system_jni_system", []string{"libjni_system"}, []string{""}},
|
|
{"test_app_system_jni_system_ext", []string{"libjni_system_ext"}, []string{"_SYSTEM_EXT"}},
|
|
{"test_app_system_ext_jni_system", []string{"libjni_system"}, []string{""}},
|
|
{"test_app_system_ext_jni_system_ext", []string{"libjni_system_ext"}, []string{"_SYSTEM_EXT"}},
|
|
{"test_app_product_jni_product", []string{"libjni_product"}, []string{"_PRODUCT"}},
|
|
{"test_app_vendor_jni_odm", []string{"libjni_odm"}, []string{"_ODM"}},
|
|
{"test_app_odm_jni_vendor", []string{"libjni_vendor"}, []string{"_VENDOR"}},
|
|
{"test_app_system_jni_multiple", []string{"libjni_system", "libjni_system_ext"}, []string{"", "_SYSTEM_EXT"}},
|
|
{"test_app_vendor_jni_multiple", []string{"libjni_odm", "libjni_vendor"}, []string{"_ODM", "_VENDOR"}},
|
|
}
|
|
|
|
for _, test := range testCases {
|
|
t.Run(test.name, func(t *testing.T) {
|
|
mod := ctx.ModuleForTests(test.name, "android_common").Module()
|
|
entry := android.AndroidMkEntriesForTest(t, ctx.TestContext, mod)[0]
|
|
for i := range test.partitionNames {
|
|
actual := entry.EntryMap["LOCAL_SOONG_JNI_LIBS_PARTITION_"+arch][i]
|
|
expected := test.partitionNames[i] + ":" + test.partitionTags[i]
|
|
android.AssertStringEquals(t, "Expected and actual differ", expected, actual)
|
|
}
|
|
})
|
|
}
|
|
}
|