diff options
| author | Rob Seymour <rseymour@google.com> | 2021-05-07 14:14:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-05-07 14:14:49 +0000 |
| commit | 4ad8c00c6fa45ff89974e9b47ae0cca838b83b28 (patch) | |
| tree | 69a0c5012bf3074997b8d45e745cb8c8a6c4e643 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 6b0034671749cf740eab136547e9b8887471c41a (diff) | |
| parent | fd9e5a71c30e3625a6096f412e200b598416260a (diff) | |
Merge changes from topic "SP1A.210425.001" into s-keystone-qcom-dev
* changes:
Exposes framework-connectivity to vendor subpackages.
Add back framework-jarjar-rules filegroup to resolve build error
Merge SP1A.210425.001
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
| -rw-r--r-- | tools/aapt2/java/JavaClassGenerator_test.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/aapt2/java/JavaClassGenerator_test.cpp b/tools/aapt2/java/JavaClassGenerator_test.cpp index 8bb3ee93d312..d08b61e5ff66 100644 --- a/tools/aapt2/java/JavaClassGenerator_test.cpp +++ b/tools/aapt2/java/JavaClassGenerator_test.cpp @@ -334,11 +334,12 @@ TEST(JavaClassGeneratorTest, CommentsForStyleablesAndNestedAttributesArePresent) styleable.entries.push_back(Reference(test::ParseNameOrDie("android:attr/one"))); styleable.SetComment(StringPiece("This is a styleable")); + CloningValueTransformer cloner(nullptr); std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder() .AddValue("android:attr/one", util::make_unique<Attribute>(attr)) .AddValue("android:styleable/Container", - std::unique_ptr<Styleable>(styleable.Clone(nullptr))) + std::unique_ptr<Styleable>(styleable.Transform(cloner))) .Build(); std::unique_ptr<IAaptContext> context = @@ -371,11 +372,12 @@ TEST(JavaClassGeneratorTest, CommentsForStyleableHiddenAttributesAreNotPresent) styleable.entries.push_back(Reference(test::ParseNameOrDie("android:attr/one"))); styleable.SetComment(StringPiece("This is a styleable")); + CloningValueTransformer cloner(nullptr); std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder() .AddValue("android:attr/one", util::make_unique<Attribute>(attr)) .AddValue("android:styleable/Container", - std::unique_ptr<Styleable>(styleable.Clone(nullptr))) + std::unique_ptr<Styleable>(styleable.Transform(cloner))) .Build(); std::unique_ptr<IAaptContext> context = |