Merge "Set test config of Robolectric tests to LOCAL_FULL_TEST_CONFIG
" am: bbfe9480be
am: 1a6ec80b34
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2434852 Change-Id: I0f8238d0df72851edc0070a6d2dfdb995895f7e5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -302,6 +302,9 @@ func (r *robolectricTest) AndroidMkEntries() []android.AndroidMkEntries {
|
|||||||
func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) {
|
func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) {
|
||||||
entries.SetBool("LOCAL_UNINSTALLABLE_MODULE", true)
|
entries.SetBool("LOCAL_UNINSTALLABLE_MODULE", true)
|
||||||
entries.AddStrings("LOCAL_COMPATIBILITY_SUITE", "robolectric-tests")
|
entries.AddStrings("LOCAL_COMPATIBILITY_SUITE", "robolectric-tests")
|
||||||
|
if r.testConfig != nil {
|
||||||
|
entries.SetPath("LOCAL_FULL_TEST_CONFIG", r.testConfig)
|
||||||
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
entries.ExtraFooters = []android.AndroidMkExtraFootersFunc{
|
entries.ExtraFooters = []android.AndroidMkExtraFootersFunc{
|
||||||
|
Reference in New Issue
Block a user