diff options
author | Jooyung Han <jooyung@google.com> | 2020-06-22 17:05:58 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-22 17:05:58 +0000 |
commit | d166f7927852b8e935e20bc5825511211c191ff8 (patch) | |
tree | c638dc5c0cc194613f81c5a08cbdfcbbd777d7fa /apex/apex_test.go | |
parent | 4c21463f04bf50d401c7106419a32bf2f7c8b369 (diff) | |
parent | faa5399b3f304ab152c39c858d0ca4af8735a750 (diff) | |
download | build_soong-d166f7927852b8e935e20bc5825511211c191ff8.tar.gz build_soong-d166f7927852b8e935e20bc5825511211c191ff8.tar.bz2 build_soong-d166f7927852b8e935e20bc5825511211c191ff8.zip |
Merge "apex: make allowed_files prop overridable" into rvc-dev
Diffstat (limited to 'apex/apex_test.go')
-rw-r--r-- | apex/apex_test.go | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/apex/apex_test.go b/apex/apex_test.go index e2cc104f..770afd42 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -4991,6 +4991,61 @@ func TestApexKeysTxt(t *testing.T) { ensureContains(t, content, `name="myapex.apex" public_key="PRESIGNED" private_key="PRESIGNED" container_certificate="PRESIGNED" container_private_key="PRESIGNED" partition="system"`) } +func TestAllowedFiles(t *testing.T) { + ctx, _ := testApex(t, ` + apex { + name: "myapex", + key: "myapex.key", + apps: ["app"], + allowed_files: "allowed.txt", + } + + apex_key { + name: "myapex.key", + public_key: "testkey.avbpubkey", + private_key: "testkey.pem", + } + + android_app { + name: "app", + srcs: ["foo/bar/MyClass.java"], + package_name: "foo", + sdk_version: "none", + system_modules: "none", + apex_available: [ "myapex" ], + } + `, withFiles(map[string][]byte{ + "sub/Android.bp": []byte(` + override_apex { + name: "override_myapex", + base: "myapex", + apps: ["override_app"], + allowed_files: ":allowed", + } + // Overridable "path" property should be referenced indirectly + filegroup { + name: "allowed", + srcs: ["allowed.txt"], + } + override_android_app { + name: "override_app", + base: "app", + package_name: "bar", + } + `), + })) + + rule := ctx.ModuleForTests("myapex", "android_common_myapex_image").Rule("diffApexContentRule") + if expected, actual := "allowed.txt", rule.Args["allowed_files_file"]; expected != actual { + t.Errorf("allowed_files_file: expected %q but got %q", expected, actual) + } + + rule2 := ctx.ModuleForTests("myapex", "android_common_override_myapex_myapex_image").Rule("diffApexContentRule") + if expected, actual := "sub/allowed.txt", rule2.Args["allowed_files_file"]; expected != actual { + t.Errorf("allowed_files_file: expected %q but got %q", expected, actual) + } +} + func TestMain(m *testing.M) { run := func() int { setUp() |