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

Merge "Fixes host_required_modules for test_module_config" into main am: f771470d8c am: 548cecc0de

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3274732

Change-Id: I36f4e794a535ed35f26a968407df701017236ed6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-09-20 03:11:15 +00:00
committed by Automerger Merge Worker
parent df603135e1 548cecc0de
commit b3f386837b
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tradefed_modules/test_module_config.go
View File

@@ -242,6 +242,7 @@ func (m *testModuleConfigModule) AndroidMkEntries() []android.AndroidMkEntries {
entries.SetBoolIfTrue("LOCAL_IS_UNIT_TEST", m.provider.IsUnitTest) entries.SetBoolIfTrue("LOCAL_IS_UNIT_TEST", m.provider.IsUnitTest)
entries.AddCompatibilityTestSuites(m.tradefedProperties.Test_suites...) entries.AddCompatibilityTestSuites(m.tradefedProperties.Test_suites...)
entries.AddStrings("LOCAL_HOST_REQUIRED_MODULES", m.provider.HostRequiredModuleNames...)
// The app_prebuilt_internal.mk files try create a copy of the OutputFile as an .apk. // The app_prebuilt_internal.mk files try create a copy of the OutputFile as an .apk.
// Normally, this copies the "package.apk" from the intermediate directory here. // Normally, this copies the "package.apk" from the intermediate directory here.

2
tradefed_modules/test_module_config_test.go
View File

@@ -40,6 +40,7 @@ const bp = `
name: "base", name: "base",
sdk_version: "current", sdk_version: "current",
data: [":HelperApp", "data/testfile"], data: [":HelperApp", "data/testfile"],
host_required: ["other-module"],
test_suites: ["general-tests"], test_suites: ["general-tests"],
} }
@@ -80,6 +81,7 @@ func TestModuleConfigAndroidTest(t *testing.T) {
android.AssertArrayString(t, "", entries.EntryMap["LOCAL_COMPATIBILITY_SUPPORT_FILES"], []string{}) android.AssertArrayString(t, "", entries.EntryMap["LOCAL_COMPATIBILITY_SUPPORT_FILES"], []string{})
android.AssertArrayString(t, "", entries.EntryMap["LOCAL_REQUIRED_MODULES"], []string{"base"}) android.AssertArrayString(t, "", entries.EntryMap["LOCAL_REQUIRED_MODULES"], []string{"base"})
android.AssertArrayString(t, "", entries.EntryMap["LOCAL_HOST_REQUIRED_MODULES"], []string{"other-module"})
android.AssertArrayString(t, "", entries.EntryMap["LOCAL_CERTIFICATE"], []string{"build/make/target/product/security/testkey.x509.pem"}) android.AssertArrayString(t, "", entries.EntryMap["LOCAL_CERTIFICATE"], []string{"build/make/target/product/security/testkey.x509.pem"})
android.AssertStringEquals(t, "", entries.Class, "APPS") android.AssertStringEquals(t, "", entries.Class, "APPS")