diff options
| author | Jiyong Park <jiyong@google.com> | 2020-02-17 17:28:10 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2020-02-19 09:47:37 +0900 |
| commit | e383388f98e4916b32f7439ce54cfb58f5a8be9a (patch) | |
| tree | 7c4e5fc0bacf632de72e7a6d6f26f3a3df9f609f /java/java_test.go | |
| parent | 954b29728db00a55c9ec366ef8c7a2fdd0329583 (diff) | |
Permissions XML file for java_sdk_library is mutated for APEX
This change fixes a regression that was introduced with
I597bccbb177b6b6320c3a3edeff467243230d384. With the change, the content
of the permissions XML file for a java_sdk_library was determined before
the java_sdk_library is mutated for an APEX. As a result, the file path
to the implementation jar library was always set to
/system/framework/*.jar regardless of whether the java_sdk_library is
part of an APEX or not.
This change fixes the problem, by creating the permissions XML file via
a new module type. The content of the xml file is determined after the
xml file is mutated for APEXes.
Bug: 149600642
Test: m
Change-Id: Id21f8d8285df49b0b3be1daf0f101f2bc978eeb0
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/java_test.go b/java/java_test.go index a2226b59e..876c9ca37 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -1125,7 +1125,7 @@ func TestJavaSdkLibrary(t *testing.T) { ctx.ModuleForTests("foo"+sdkStubsSourceSuffix, "android_common") ctx.ModuleForTests("foo"+sdkStubsSourceSuffix+sdkSystemApiSuffix, "android_common") ctx.ModuleForTests("foo"+sdkStubsSourceSuffix+sdkTestApiSuffix, "android_common") - ctx.ModuleForTests("foo"+sdkXmlFileSuffix, "android_arm64_armv8-a") + ctx.ModuleForTests("foo"+sdkXmlFileSuffix, "android_common") ctx.ModuleForTests("foo.api.public.28", "") ctx.ModuleForTests("foo.api.system.28", "") ctx.ModuleForTests("foo.api.test.28", "") |