Merge "Revert "bp2build converter for android_test_helper_app."" into main
This commit is contained in:
27
java/app.go
27
java/app.go
@@ -1258,8 +1258,6 @@ type AndroidTestHelperApp struct {
|
||||
AndroidApp
|
||||
|
||||
appTestHelperAppProperties appTestHelperAppProperties
|
||||
|
||||
android.BazelModuleBase
|
||||
}
|
||||
|
||||
func (a *AndroidTestHelperApp) InstallInTestcases() bool {
|
||||
@@ -1291,7 +1289,6 @@ func AndroidTestHelperAppFactory() android.Module {
|
||||
android.InitAndroidMultiTargetsArchModule(module, android.DeviceSupported, android.MultilibCommon)
|
||||
android.InitDefaultableModule(module)
|
||||
android.InitApexModule(module)
|
||||
android.InitBazelModule(module)
|
||||
return module
|
||||
}
|
||||
|
||||
@@ -1802,27 +1799,3 @@ func (at *AndroidTest) ConvertWithBp2build(ctx android.Bp2buildMutatorContext) {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func (atha *AndroidTestHelperApp) ConvertWithBp2build(ctx android.TopDownMutatorContext) {
|
||||
if ok, commonAttrs, appAttrs := convertWithBp2build(ctx, &atha.AndroidApp); ok {
|
||||
// an android_test_helper_app is an android_binary with testonly = True
|
||||
commonAttrs.Testonly = proptools.BoolPtr(true)
|
||||
|
||||
// additionally, it sets default values differently to android_app,
|
||||
// https://cs.android.com/android/platform/superproject/main/+/main:build/soong/java/app.go;l=1273-1279;drc=e12c083198403ec694af6c625aed11327eb2bf7f
|
||||
//
|
||||
// installable: true (settable prop)
|
||||
// use_embedded_native_libs: true (settable prop)
|
||||
// lint.test: true (settable prop)
|
||||
// optimize EnabledByDefault: true (blueprint mutated prop)
|
||||
// AlwaysPackageNativeLibs: true (blueprint mutated prop)
|
||||
// dexpreopt isTest: true (not prop)
|
||||
|
||||
props := bazel.BazelTargetModuleProperties{
|
||||
Rule_class: "android_binary",
|
||||
Bzl_load_location: "//build/bazel/rules/android:android_binary.bzl",
|
||||
}
|
||||
|
||||
ctx.CreateBazelTargetModule(props, commonAttrs, appAttrs)
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user