diff options
| author | 2024-08-27 15:03:59 -0700 | |
|---|---|---|
| committer | 2024-08-27 15:50:35 -0700 | |
| commit | 08c7f865756bf1e262c8ea3162c701312fe6dadb (patch) | |
| tree | 6093ff21ec60789ad42bd7fe71c09844a981f90a /java | |
| parent | 4b98396c647e1b247c3b50ea723bfecac68a7789 (diff) | |
Make IdeInfo into a provider
In order to keep the changes minimal, call the old IdeInfo method right
after GenerateAndroidBuildActions and then set the result of that
into a provider.
Test: Diff'd ninja files and saw no difference.
Change-Id: Ic706e7dbcb7c6e3d2a381ddae383eb87e105f385
Diffstat (limited to 'java')
| -rw-r--r-- | java/jdeps.go | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/java/jdeps.go b/java/jdeps.go index e856b37ee..c2ce50383 100644 --- a/java/jdeps.go +++ b/java/jdeps.go @@ -57,27 +57,19 @@ func (j *jdepsGeneratorSingleton) GenerateBuildActions(ctx android.SingletonCont return } - ideInfoProvider, ok := module.(android.IDEInfo) + ideInfoProvider, ok := android.OtherModuleProvider(ctx, module, android.IdeInfoProviderKey) if !ok { return } - name := ideInfoProvider.BaseModuleName() + name := ideInfoProvider.BaseModuleName ideModuleNameProvider, ok := module.(android.IDECustomizedModuleName) if ok { name = ideModuleNameProvider.IDECustomizedModuleName() } dpInfo := moduleInfos[name] - ideInfoProvider.IDEInfo(&dpInfo) - dpInfo.Deps = android.FirstUniqueStrings(dpInfo.Deps) - dpInfo.Srcs = android.FirstUniqueStrings(dpInfo.Srcs) - dpInfo.Aidl_include_dirs = android.FirstUniqueStrings(dpInfo.Aidl_include_dirs) - dpInfo.Jarjar_rules = android.FirstUniqueStrings(dpInfo.Jarjar_rules) - dpInfo.Jars = android.FirstUniqueStrings(dpInfo.Jars) - dpInfo.SrcJars = android.FirstUniqueStrings(dpInfo.SrcJars) + dpInfo = dpInfo.Merge(ideInfoProvider) dpInfo.Paths = []string{ctx.ModuleDir(module)} - dpInfo.Static_libs = android.FirstUniqueStrings(dpInfo.Static_libs) - dpInfo.Libs = android.FirstUniqueStrings(dpInfo.Libs) moduleInfos[name] = dpInfo mkProvider, ok := module.(android.AndroidMkDataProvider) |