diff options
| author | Ryan Mitchell <rtmitchell@google.com> | 2021-03-02 20:02:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-03-02 20:02:24 +0000 |
| commit | 51ee3d1944ce1b8b538431f225c76bce8738dcfb (patch) | |
| tree | 785a2d7c1155592b0345d1db5d23b8e6705a335d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e220bd928af641d77acb0419098425e979a05e6d (diff) | |
| parent | 5855de7ed652aadb4859a0070ed0b6e60824c10c (diff) | |
Merge "Use R field directly for shared lib styleable attrs" into sc-dev
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
| -rw-r--r-- | tools/aapt2/java/JavaClassGenerator_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt2/java/JavaClassGenerator_test.cpp b/tools/aapt2/java/JavaClassGenerator_test.cpp index 04e20101a0dd..ec5b4151b1a6 100644 --- a/tools/aapt2/java/JavaClassGenerator_test.cpp +++ b/tools/aapt2/java/JavaClassGenerator_test.cpp @@ -581,7 +581,7 @@ TEST(JavaClassGeneratorTest, SortsDynamicAttributesAfterFrameworkAttributes) { out.Flush(); EXPECT_THAT(output, HasSubstr("public static final int[] MyStyleable={")); - EXPECT_THAT(output, HasSubstr("0x01010000, 0x00010000")); + EXPECT_THAT(output, HasSubstr("0x01010000, lib.R.attr.dynamic_attr")); EXPECT_THAT(output, HasSubstr("public static final int MyStyleable_android_framework_attr=0;")); EXPECT_THAT(output, HasSubstr("public static final int MyStyleable_dynamic_attr=1;")); } |