diff options
author | Udam Saini <udam@google.com> | 2019-06-18 16:50:34 -0700 |
---|---|---|
committer | Udam Saini <udam@google.com> | 2019-06-26 13:30:35 -0700 |
commit | b228df32d9782b4d9c383e82dd1f1ffaf2227e36 (patch) | |
tree | 132bd3566c2b953d6c4287ba35502334418c72cd /tools/aapt2/optimize/MultiApkGenerator.cpp | |
parent | 9aeeb3e5e921a318cb27e15b9375b5ff68b1d893 (diff) |
Allows features to link to other feature splits without namespacing.
Add uses-split dependencies to AppInfo. At link time, this is used
and allows features to reference other features, before
resource namespacing is implemented in Android Studio.
bug:135681292
Test: Link_test, ReferenceLinker_test, and integration tests.
Change-Id: Ifdf0067e7370552b6b9d4d6d4713d4484b6ea154
Diffstat (limited to 'tools/aapt2/optimize/MultiApkGenerator.cpp')
-rw-r--r-- | tools/aapt2/optimize/MultiApkGenerator.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/aapt2/optimize/MultiApkGenerator.cpp b/tools/aapt2/optimize/MultiApkGenerator.cpp index 8c9c43409569..c686a10a3fa9 100644 --- a/tools/aapt2/optimize/MultiApkGenerator.cpp +++ b/tools/aapt2/optimize/MultiApkGenerator.cpp @@ -101,6 +101,10 @@ class ContextWrapper : public IAaptContext { util::make_unique<SourcePathDiagnostics>(Source{source}, context_->GetDiagnostics()); } + const std::set<std::string>& GetSplitNameDependencies() override { + return context_->GetSplitNameDependencies(); + } + private: IAaptContext* context_; std::unique_ptr<SourcePathDiagnostics> source_diag_; |