diff options
| author | Colin Cross <ccross@android.com> | 2024-01-12 10:15:31 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2024-01-12 10:16:06 -0800 |
| commit | f3b6953e5350ff6e56a607e70dd13fd856473d8c (patch) | |
| tree | 80ca4df1f6c3f595362cc0d6625aef7c437efe9a | |
| parent | f3cbc5df1f140794428267eb45f44f9d57c81601 (diff) | |
| parent | 8ce1d0abd195c24a75d9ddcb0ea31b1d1b62aaa6 (diff) | |
| download | jarjar-f3b6953e5350ff6e56a607e70dd13fd856473d8c.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master'
* aosp/upstream-master:
Add ServiceProcessor to MainProcessor
Bug: 318750023
Test: m javac-check
Change-Id: Ie073f84085384b0cbfece22ad857bfe8eaa4e96a
| -rw-r--r-- | METADATA | 4 | ||||
| -rw-r--r-- | src/main/com/tonicsystems/jarjar/MainProcessor.java | 1 |
2 files changed, 3 insertions, 2 deletions
@@ -8,7 +8,7 @@ third_party { type: GIT value: "https://github.com/google/jarjar.git" } - version: "07130d7bb682571c670ff3f1fcddcd5230a56b9d" - last_upgrade_date { year: 2024 month: 1 day: 10 } + version: "8ce1d0abd195c24a75d9ddcb0ea31b1d1b62aaa6" + last_upgrade_date { year: 2024 month: 1 day: 12 } license_type: NOTICE } diff --git a/src/main/com/tonicsystems/jarjar/MainProcessor.java b/src/main/com/tonicsystems/jarjar/MainProcessor.java index 1f676c2..5839719 100644 --- a/src/main/com/tonicsystems/jarjar/MainProcessor.java +++ b/src/main/com/tonicsystems/jarjar/MainProcessor.java @@ -96,6 +96,7 @@ class MainProcessor implements JarProcessor { new JarTransformerChain( new RemappingClassTransformer[] {new RemappingClassTransformer(pr)})); processors.add(new ResourceProcessor(pr)); + processors.add(new ServiceProcessor(pr)); chain = new JarProcessorChain(processors.toArray(new JarProcessor[0])); } |