Bp2build support for JNI deps of android_app.
Change-Id: I3f934ecb0323129e1bb1eb75527395e39467380d Bug: 297405812
This commit is contained in:
@@ -16,6 +16,7 @@ package bp2build
|
||||
|
||||
import (
|
||||
"android/soong/android"
|
||||
"android/soong/cc"
|
||||
"android/soong/java"
|
||||
|
||||
"testing"
|
||||
@@ -29,6 +30,7 @@ func runAndroidAppTestCase(t *testing.T, tc Bp2buildTestCase) {
|
||||
func registerAndroidAppModuleTypes(ctx android.RegistrationContext) {
|
||||
ctx.RegisterModuleType("filegroup", android.FileGroupFactory)
|
||||
ctx.RegisterModuleType("java_library", java.LibraryFactory)
|
||||
ctx.RegisterModuleType("cc_library_shared", cc.LibrarySharedFactory)
|
||||
}
|
||||
|
||||
func TestMinimalAndroidApp(t *testing.T) {
|
||||
@@ -78,8 +80,9 @@ func TestAndroidAppAllSupportedFields(t *testing.T) {
|
||||
"manifest/AndroidManifest.xml": "",
|
||||
"assets_/asset.png": "",
|
||||
},
|
||||
StubbedBuildDefinitions: []string{"static_lib_dep"},
|
||||
Blueprint: simpleModule("android_app", "static_lib_dep") + `
|
||||
StubbedBuildDefinitions: []string{"static_lib_dep", "jni_lib"},
|
||||
Blueprint: simpleModule("android_app", "static_lib_dep") +
|
||||
simpleModule("cc_library_shared", "jni_lib") + `
|
||||
android_app {
|
||||
name: "TestApp",
|
||||
srcs: ["app.java"],
|
||||
@@ -100,6 +103,7 @@ android_app {
|
||||
obfuscate: false,
|
||||
ignore_warnings: true,
|
||||
},
|
||||
jni_libs: ["jni_lib"],
|
||||
}
|
||||
`,
|
||||
ExpectedBazelTargets: []string{
|
||||
@@ -110,10 +114,13 @@ android_app {
|
||||
"resa/res.png",
|
||||
"resb/res.png",
|
||||
]`,
|
||||
"assets": `["assets_/asset.png"]`,
|
||||
"assets_dir": `"assets_"`,
|
||||
"custom_package": `"com.google"`,
|
||||
"deps": `[":static_lib_dep"]`,
|
||||
"assets": `["assets_/asset.png"]`,
|
||||
"assets_dir": `"assets_"`,
|
||||
"custom_package": `"com.google"`,
|
||||
"deps": `[
|
||||
":static_lib_dep",
|
||||
":jni_lib",
|
||||
]`,
|
||||
"java_version": `"7"`,
|
||||
"sdk_version": `"current"`,
|
||||
"certificate_name": `"foocert"`,
|
||||
|
Reference in New Issue
Block a user