diff options
Diffstat (limited to 'apex/apex_test.go')
| -rw-r--r-- | apex/apex_test.go | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/apex/apex_test.go b/apex/apex_test.go index 200a1c29..c671e7c3 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -27,8 +27,11 @@ import ( "android/soong/java" ) +var buildDir string + func testApex(t *testing.T, bp string) *android.TestContext { - config, buildDir := setup(t) + var config android.Config + config, buildDir = setup(t) defer teardown(buildDir) ctx := android.NewTestArchContext() @@ -310,6 +313,8 @@ func TestBasicApex(t *testing.T) { optFlags := apexRule.Args["opt_flags"] ensureContains(t, optFlags, "--pubkey vendor/foo/devkeys/testkey.avbpubkey") + // Ensure that the NOTICE output is being packaged as an asset. + ensureContains(t, optFlags, "--assets_dir "+buildDir+"/.intermediates/myapex/android_common_myapex/NOTICE") copyCmds := apexRule.Args["copy_commands"] @@ -349,8 +354,8 @@ func TestBasicApex(t *testing.T) { mergeNoticesRule := ctx.ModuleForTests("myapex", "android_common_myapex").Rule("mergeNoticesRule") noticeInputs := mergeNoticesRule.Inputs.Strings() - if len(noticeInputs) != 4 { - t.Errorf("number of input notice files: expected = 4, actual = %q", len(noticeInputs)) + if len(noticeInputs) != 2 { + t.Errorf("number of input notice files: expected = 2, actual = %q", len(noticeInputs)) } ensureListContains(t, noticeInputs, "NOTICE") ensureListContains(t, noticeInputs, "custom_notice") |