Initial bp2build converter for android_app.
The only supported attributes at this point are:
- srcs
- manifest
- package_name
- resource_dirs
as they most easily map to bazel's android_binary's srcs, manifest, custom_package, and resource_files respectively.
Allow-listing all apps that use these fields, along with sdk_version and dex_preopt. The latter 2 are ignored by the converter,
- sdk_version because we're currently relying on a single pre-built SDK,
- dex_preopt because,
1. though it is not supported in Bazel builds yet, it doesn't prevent the apps from building, and
2. the apps being converted only use the dex_preopt attribute to disable dex_preopt, which is what is happening anyway.
Change-Id: I4a4f771eeb8f60a1cd4844b2ac1ce3df7c070e73
Test: ./build/bazel/scripts/run_presubmits.sh
Bug: 198224074
Bug: 203688791
2021-10-29 16:52:59 +02:00
|
|
|
// Copyright 2021 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 bp2build
|
|
|
|
|
|
|
|
import (
|
|
|
|
"android/soong/android"
|
|
|
|
"android/soong/java"
|
|
|
|
|
|
|
|
"testing"
|
|
|
|
)
|
|
|
|
|
2022-06-21 21:28:33 +02:00
|
|
|
func runAndroidAppTestCase(t *testing.T, tc Bp2buildTestCase) {
|
Initial bp2build converter for android_app.
The only supported attributes at this point are:
- srcs
- manifest
- package_name
- resource_dirs
as they most easily map to bazel's android_binary's srcs, manifest, custom_package, and resource_files respectively.
Allow-listing all apps that use these fields, along with sdk_version and dex_preopt. The latter 2 are ignored by the converter,
- sdk_version because we're currently relying on a single pre-built SDK,
- dex_preopt because,
1. though it is not supported in Bazel builds yet, it doesn't prevent the apps from building, and
2. the apps being converted only use the dex_preopt attribute to disable dex_preopt, which is what is happening anyway.
Change-Id: I4a4f771eeb8f60a1cd4844b2ac1ce3df7c070e73
Test: ./build/bazel/scripts/run_presubmits.sh
Bug: 198224074
Bug: 203688791
2021-10-29 16:52:59 +02:00
|
|
|
t.Helper()
|
2022-06-21 21:28:33 +02:00
|
|
|
RunBp2BuildTestCase(t, registerAndroidAppModuleTypes, tc)
|
Initial bp2build converter for android_app.
The only supported attributes at this point are:
- srcs
- manifest
- package_name
- resource_dirs
as they most easily map to bazel's android_binary's srcs, manifest, custom_package, and resource_files respectively.
Allow-listing all apps that use these fields, along with sdk_version and dex_preopt. The latter 2 are ignored by the converter,
- sdk_version because we're currently relying on a single pre-built SDK,
- dex_preopt because,
1. though it is not supported in Bazel builds yet, it doesn't prevent the apps from building, and
2. the apps being converted only use the dex_preopt attribute to disable dex_preopt, which is what is happening anyway.
Change-Id: I4a4f771eeb8f60a1cd4844b2ac1ce3df7c070e73
Test: ./build/bazel/scripts/run_presubmits.sh
Bug: 198224074
Bug: 203688791
2021-10-29 16:52:59 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
func registerAndroidAppModuleTypes(ctx android.RegistrationContext) {
|
2022-10-14 11:56:07 +02:00
|
|
|
ctx.RegisterModuleType("filegroup", android.FileGroupFactory)
|
2023-01-05 22:12:31 +01:00
|
|
|
ctx.RegisterModuleType("java_library", java.LibraryFactory)
|
Initial bp2build converter for android_app.
The only supported attributes at this point are:
- srcs
- manifest
- package_name
- resource_dirs
as they most easily map to bazel's android_binary's srcs, manifest, custom_package, and resource_files respectively.
Allow-listing all apps that use these fields, along with sdk_version and dex_preopt. The latter 2 are ignored by the converter,
- sdk_version because we're currently relying on a single pre-built SDK,
- dex_preopt because,
1. though it is not supported in Bazel builds yet, it doesn't prevent the apps from building, and
2. the apps being converted only use the dex_preopt attribute to disable dex_preopt, which is what is happening anyway.
Change-Id: I4a4f771eeb8f60a1cd4844b2ac1ce3df7c070e73
Test: ./build/bazel/scripts/run_presubmits.sh
Bug: 198224074
Bug: 203688791
2021-10-29 16:52:59 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
func TestMinimalAndroidApp(t *testing.T) {
|
2022-06-21 21:28:33 +02:00
|
|
|
runAndroidAppTestCase(t, Bp2buildTestCase{
|
|
|
|
Description: "Android app - simple example",
|
|
|
|
ModuleTypeUnderTest: "android_app",
|
|
|
|
ModuleTypeUnderTestFactory: java.AndroidAppFactory,
|
|
|
|
Filesystem: map[string]string{
|
Initial bp2build converter for android_app.
The only supported attributes at this point are:
- srcs
- manifest
- package_name
- resource_dirs
as they most easily map to bazel's android_binary's srcs, manifest, custom_package, and resource_files respectively.
Allow-listing all apps that use these fields, along with sdk_version and dex_preopt. The latter 2 are ignored by the converter,
- sdk_version because we're currently relying on a single pre-built SDK,
- dex_preopt because,
1. though it is not supported in Bazel builds yet, it doesn't prevent the apps from building, and
2. the apps being converted only use the dex_preopt attribute to disable dex_preopt, which is what is happening anyway.
Change-Id: I4a4f771eeb8f60a1cd4844b2ac1ce3df7c070e73
Test: ./build/bazel/scripts/run_presubmits.sh
Bug: 198224074
Bug: 203688791
2021-10-29 16:52:59 +02:00
|
|
|
"app.java": "",
|
|
|
|
"res/res.png": "",
|
|
|
|
"AndroidManifest.xml": "",
|
|
|
|
},
|
2022-06-21 21:28:33 +02:00
|
|
|
Blueprint: `
|
Initial bp2build converter for android_app.
The only supported attributes at this point are:
- srcs
- manifest
- package_name
- resource_dirs
as they most easily map to bazel's android_binary's srcs, manifest, custom_package, and resource_files respectively.
Allow-listing all apps that use these fields, along with sdk_version and dex_preopt. The latter 2 are ignored by the converter,
- sdk_version because we're currently relying on a single pre-built SDK,
- dex_preopt because,
1. though it is not supported in Bazel builds yet, it doesn't prevent the apps from building, and
2. the apps being converted only use the dex_preopt attribute to disable dex_preopt, which is what is happening anyway.
Change-Id: I4a4f771eeb8f60a1cd4844b2ac1ce3df7c070e73
Test: ./build/bazel/scripts/run_presubmits.sh
Bug: 198224074
Bug: 203688791
2021-10-29 16:52:59 +02:00
|
|
|
android_app {
|
|
|
|
name: "TestApp",
|
|
|
|
srcs: ["app.java"],
|
|
|
|
sdk_version: "current",
|
|
|
|
}
|
|
|
|
`,
|
2022-06-21 21:28:33 +02:00
|
|
|
ExpectedBazelTargets: []string{
|
2022-08-31 20:28:19 +02:00
|
|
|
MakeBazelTarget("android_binary", "TestApp", AttrNameToString{
|
Initial bp2build converter for android_app.
The only supported attributes at this point are:
- srcs
- manifest
- package_name
- resource_dirs
as they most easily map to bazel's android_binary's srcs, manifest, custom_package, and resource_files respectively.
Allow-listing all apps that use these fields, along with sdk_version and dex_preopt. The latter 2 are ignored by the converter,
- sdk_version because we're currently relying on a single pre-built SDK,
- dex_preopt because,
1. though it is not supported in Bazel builds yet, it doesn't prevent the apps from building, and
2. the apps being converted only use the dex_preopt attribute to disable dex_preopt, which is what is happening anyway.
Change-Id: I4a4f771eeb8f60a1cd4844b2ac1ce3df7c070e73
Test: ./build/bazel/scripts/run_presubmits.sh
Bug: 198224074
Bug: 203688791
2021-10-29 16:52:59 +02:00
|
|
|
"srcs": `["app.java"]`,
|
|
|
|
"manifest": `"AndroidManifest.xml"`,
|
|
|
|
"resource_files": `["res/res.png"]`,
|
|
|
|
}),
|
|
|
|
}})
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestAndroidAppAllSupportedFields(t *testing.T) {
|
2022-06-21 21:28:33 +02:00
|
|
|
runAndroidAppTestCase(t, Bp2buildTestCase{
|
|
|
|
Description: "Android app - all supported fields",
|
|
|
|
ModuleTypeUnderTest: "android_app",
|
|
|
|
ModuleTypeUnderTestFactory: java.AndroidAppFactory,
|
|
|
|
Filesystem: map[string]string{
|
Initial bp2build converter for android_app.
The only supported attributes at this point are:
- srcs
- manifest
- package_name
- resource_dirs
as they most easily map to bazel's android_binary's srcs, manifest, custom_package, and resource_files respectively.
Allow-listing all apps that use these fields, along with sdk_version and dex_preopt. The latter 2 are ignored by the converter,
- sdk_version because we're currently relying on a single pre-built SDK,
- dex_preopt because,
1. though it is not supported in Bazel builds yet, it doesn't prevent the apps from building, and
2. the apps being converted only use the dex_preopt attribute to disable dex_preopt, which is what is happening anyway.
Change-Id: I4a4f771eeb8f60a1cd4844b2ac1ce3df7c070e73
Test: ./build/bazel/scripts/run_presubmits.sh
Bug: 198224074
Bug: 203688791
2021-10-29 16:52:59 +02:00
|
|
|
"app.java": "",
|
|
|
|
"resa/res.png": "",
|
|
|
|
"resb/res.png": "",
|
|
|
|
"manifest/AndroidManifest.xml": "",
|
|
|
|
},
|
2022-06-21 21:28:33 +02:00
|
|
|
Blueprint: simpleModuleDoNotConvertBp2build("android_app", "static_lib_dep") + `
|
Initial bp2build converter for android_app.
The only supported attributes at this point are:
- srcs
- manifest
- package_name
- resource_dirs
as they most easily map to bazel's android_binary's srcs, manifest, custom_package, and resource_files respectively.
Allow-listing all apps that use these fields, along with sdk_version and dex_preopt. The latter 2 are ignored by the converter,
- sdk_version because we're currently relying on a single pre-built SDK,
- dex_preopt because,
1. though it is not supported in Bazel builds yet, it doesn't prevent the apps from building, and
2. the apps being converted only use the dex_preopt attribute to disable dex_preopt, which is what is happening anyway.
Change-Id: I4a4f771eeb8f60a1cd4844b2ac1ce3df7c070e73
Test: ./build/bazel/scripts/run_presubmits.sh
Bug: 198224074
Bug: 203688791
2021-10-29 16:52:59 +02:00
|
|
|
android_app {
|
|
|
|
name: "TestApp",
|
|
|
|
srcs: ["app.java"],
|
|
|
|
sdk_version: "current",
|
|
|
|
package_name: "com.google",
|
|
|
|
resource_dirs: ["resa", "resb"],
|
|
|
|
manifest: "manifest/AndroidManifest.xml",
|
2022-04-23 01:09:58 +02:00
|
|
|
static_libs: ["static_lib_dep"],
|
|
|
|
java_version: "7",
|
2022-10-14 11:56:07 +02:00
|
|
|
certificate: "foocert",
|
Initial bp2build converter for android_app.
The only supported attributes at this point are:
- srcs
- manifest
- package_name
- resource_dirs
as they most easily map to bazel's android_binary's srcs, manifest, custom_package, and resource_files respectively.
Allow-listing all apps that use these fields, along with sdk_version and dex_preopt. The latter 2 are ignored by the converter,
- sdk_version because we're currently relying on a single pre-built SDK,
- dex_preopt because,
1. though it is not supported in Bazel builds yet, it doesn't prevent the apps from building, and
2. the apps being converted only use the dex_preopt attribute to disable dex_preopt, which is what is happening anyway.
Change-Id: I4a4f771eeb8f60a1cd4844b2ac1ce3df7c070e73
Test: ./build/bazel/scripts/run_presubmits.sh
Bug: 198224074
Bug: 203688791
2021-10-29 16:52:59 +02:00
|
|
|
}
|
|
|
|
`,
|
2022-06-21 21:28:33 +02:00
|
|
|
ExpectedBazelTargets: []string{
|
2022-08-31 20:28:19 +02:00
|
|
|
MakeBazelTarget("android_binary", "TestApp", AttrNameToString{
|
Initial bp2build converter for android_app.
The only supported attributes at this point are:
- srcs
- manifest
- package_name
- resource_dirs
as they most easily map to bazel's android_binary's srcs, manifest, custom_package, and resource_files respectively.
Allow-listing all apps that use these fields, along with sdk_version and dex_preopt. The latter 2 are ignored by the converter,
- sdk_version because we're currently relying on a single pre-built SDK,
- dex_preopt because,
1. though it is not supported in Bazel builds yet, it doesn't prevent the apps from building, and
2. the apps being converted only use the dex_preopt attribute to disable dex_preopt, which is what is happening anyway.
Change-Id: I4a4f771eeb8f60a1cd4844b2ac1ce3df7c070e73
Test: ./build/bazel/scripts/run_presubmits.sh
Bug: 198224074
Bug: 203688791
2021-10-29 16:52:59 +02:00
|
|
|
"srcs": `["app.java"]`,
|
|
|
|
"manifest": `"manifest/AndroidManifest.xml"`,
|
|
|
|
"resource_files": `[
|
|
|
|
"resa/res.png",
|
|
|
|
"resb/res.png",
|
|
|
|
]`,
|
2022-10-14 11:56:07 +02:00
|
|
|
"custom_package": `"com.google"`,
|
|
|
|
"deps": `[":static_lib_dep"]`,
|
|
|
|
"javacopts": `["-source 1.7 -target 1.7"]`,
|
|
|
|
"certificate_name": `"foocert"`,
|
Initial bp2build converter for android_app.
The only supported attributes at this point are:
- srcs
- manifest
- package_name
- resource_dirs
as they most easily map to bazel's android_binary's srcs, manifest, custom_package, and resource_files respectively.
Allow-listing all apps that use these fields, along with sdk_version and dex_preopt. The latter 2 are ignored by the converter,
- sdk_version because we're currently relying on a single pre-built SDK,
- dex_preopt because,
1. though it is not supported in Bazel builds yet, it doesn't prevent the apps from building, and
2. the apps being converted only use the dex_preopt attribute to disable dex_preopt, which is what is happening anyway.
Change-Id: I4a4f771eeb8f60a1cd4844b2ac1ce3df7c070e73
Test: ./build/bazel/scripts/run_presubmits.sh
Bug: 198224074
Bug: 203688791
2021-10-29 16:52:59 +02:00
|
|
|
}),
|
|
|
|
}})
|
|
|
|
}
|
2022-02-23 16:28:33 +01:00
|
|
|
|
|
|
|
func TestAndroidAppArchVariantSrcs(t *testing.T) {
|
2022-06-21 21:28:33 +02:00
|
|
|
runAndroidAppTestCase(t, Bp2buildTestCase{
|
|
|
|
Description: "Android app - arch variant srcs",
|
|
|
|
ModuleTypeUnderTest: "android_app",
|
|
|
|
ModuleTypeUnderTestFactory: java.AndroidAppFactory,
|
|
|
|
Filesystem: map[string]string{
|
2022-02-23 16:28:33 +01:00
|
|
|
"arm.java": "",
|
|
|
|
"x86.java": "",
|
|
|
|
"res/res.png": "",
|
|
|
|
"AndroidManifest.xml": "",
|
|
|
|
},
|
2022-06-21 21:28:33 +02:00
|
|
|
Blueprint: `
|
2022-02-23 16:28:33 +01:00
|
|
|
android_app {
|
|
|
|
name: "TestApp",
|
|
|
|
sdk_version: "current",
|
|
|
|
arch: {
|
|
|
|
arm: {
|
|
|
|
srcs: ["arm.java"],
|
|
|
|
},
|
|
|
|
x86: {
|
|
|
|
srcs: ["x86.java"],
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
`,
|
2022-06-21 21:28:33 +02:00
|
|
|
ExpectedBazelTargets: []string{
|
2022-08-31 20:28:19 +02:00
|
|
|
MakeBazelTarget("android_binary", "TestApp", AttrNameToString{
|
2022-02-23 16:28:33 +01:00
|
|
|
"srcs": `select({
|
|
|
|
"//build/bazel/platforms/arch:arm": ["arm.java"],
|
|
|
|
"//build/bazel/platforms/arch:x86": ["x86.java"],
|
|
|
|
"//conditions:default": [],
|
|
|
|
})`,
|
|
|
|
"manifest": `"AndroidManifest.xml"`,
|
|
|
|
"resource_files": `["res/res.png"]`,
|
|
|
|
}),
|
|
|
|
}})
|
|
|
|
}
|
2022-10-14 11:56:07 +02:00
|
|
|
|
|
|
|
func TestAndroidAppCertIsModule(t *testing.T) {
|
|
|
|
runAndroidAppTestCase(t, Bp2buildTestCase{
|
|
|
|
Description: "Android app - cert is module",
|
|
|
|
ModuleTypeUnderTest: "android_app",
|
|
|
|
ModuleTypeUnderTestFactory: java.AndroidAppFactory,
|
|
|
|
Filesystem: map[string]string{},
|
|
|
|
Blueprint: simpleModuleDoNotConvertBp2build("filegroup", "foocert") + `
|
|
|
|
android_app {
|
|
|
|
name: "TestApp",
|
|
|
|
certificate: ":foocert",
|
|
|
|
}
|
|
|
|
`,
|
|
|
|
ExpectedBazelTargets: []string{
|
|
|
|
MakeBazelTarget("android_binary", "TestApp", AttrNameToString{
|
|
|
|
"certificate": `":foocert"`,
|
|
|
|
"manifest": `"AndroidManifest.xml"`,
|
|
|
|
"resource_files": `[]`,
|
|
|
|
}),
|
|
|
|
}})
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestAndroidAppCertIsSrcFile(t *testing.T) {
|
|
|
|
runAndroidAppTestCase(t, Bp2buildTestCase{
|
|
|
|
Description: "Android app - cert is src file",
|
|
|
|
ModuleTypeUnderTest: "android_app",
|
|
|
|
ModuleTypeUnderTestFactory: java.AndroidAppFactory,
|
|
|
|
Filesystem: map[string]string{
|
|
|
|
"foocert": "",
|
|
|
|
},
|
|
|
|
Blueprint: `
|
|
|
|
android_app {
|
|
|
|
name: "TestApp",
|
|
|
|
certificate: "foocert",
|
|
|
|
}
|
|
|
|
`,
|
|
|
|
ExpectedBazelTargets: []string{
|
|
|
|
MakeBazelTarget("android_binary", "TestApp", AttrNameToString{
|
|
|
|
"certificate": `"foocert"`,
|
|
|
|
"manifest": `"AndroidManifest.xml"`,
|
|
|
|
"resource_files": `[]`,
|
|
|
|
}),
|
|
|
|
}})
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestAndroidAppCertIsNotSrcOrModule(t *testing.T) {
|
|
|
|
runAndroidAppTestCase(t, Bp2buildTestCase{
|
|
|
|
Description: "Android app - cert is not src or module",
|
|
|
|
ModuleTypeUnderTest: "android_app",
|
|
|
|
ModuleTypeUnderTestFactory: java.AndroidAppFactory,
|
|
|
|
Filesystem: map[string]string{
|
|
|
|
// deliberate empty
|
|
|
|
},
|
|
|
|
Blueprint: `
|
|
|
|
android_app {
|
|
|
|
name: "TestApp",
|
|
|
|
certificate: "foocert",
|
|
|
|
}
|
|
|
|
`,
|
|
|
|
ExpectedBazelTargets: []string{
|
|
|
|
MakeBazelTarget("android_binary", "TestApp", AttrNameToString{
|
|
|
|
"certificate_name": `"foocert"`,
|
|
|
|
"manifest": `"AndroidManifest.xml"`,
|
|
|
|
"resource_files": `[]`,
|
|
|
|
}),
|
|
|
|
}})
|
|
|
|
}
|
2023-01-05 22:12:31 +01:00
|
|
|
|
|
|
|
func TestAndroidAppLibs(t *testing.T) {
|
|
|
|
runAndroidAppTestCase(t, Bp2buildTestCase{
|
|
|
|
Description: "Android app with libs",
|
|
|
|
ModuleTypeUnderTest: "android_app",
|
|
|
|
ModuleTypeUnderTestFactory: java.AndroidAppFactory,
|
|
|
|
Filesystem: map[string]string{},
|
|
|
|
Blueprint: simpleModuleDoNotConvertBp2build("filegroup", "foocert") + `
|
|
|
|
android_app {
|
|
|
|
name: "foo",
|
|
|
|
libs: ["barLib"]
|
|
|
|
}
|
|
|
|
java_library{
|
|
|
|
name: "barLib",
|
|
|
|
}
|
|
|
|
`,
|
|
|
|
ExpectedBazelTargets: []string{
|
|
|
|
MakeBazelTarget("java_library", "barLib", AttrNameToString{}),
|
|
|
|
MakeNeverlinkDuplicateTarget("java_library", "barLib"),
|
|
|
|
MakeBazelTarget("android_binary", "foo", AttrNameToString{
|
|
|
|
"manifest": `"AndroidManifest.xml"`,
|
|
|
|
"resource_files": `[]`,
|
|
|
|
"deps": `[":barLib-neverlink"]`,
|
|
|
|
}),
|
|
|
|
}})
|
|
|
|
}
|