diff options
| author | shinwang <shinwang@google.com> | 2018-12-21 14:52:21 +0800 |
|---|---|---|
| committer | Shin Wang <shinwang@google.com> | 2018-12-21 10:37:03 +0000 |
| commit | 7f1b38fa8371eaf2a90f08e84a158fc8a0ea5218 (patch) | |
| tree | c917f312a2f9ac0b48f7384f66c6eb3f452e07b0 /java/jdeps.go | |
| parent | 539f409d783b7f9513a9459b694f4250a9906a83 (diff) | |
| download | build_soong-7f1b38fa8371eaf2a90f08e84a158fc8a0ea5218.tar.gz build_soong-7f1b38fa8371eaf2a90f08e84a158fc8a0ea5218.tar.bz2 build_soong-7f1b38fa8371eaf2a90f08e84a158fc8a0ea5218.zip | |
Modify jar dependencies collection from dexpreopt to jar with resource
Soong build system modify the jar installed path to dexpreopt, however, the jar only contains dex without java information. This patch modify the jar collection from installed path to ImplementationJars.
Bug: 121231786
Test: 1. m aidegen
2. $ANDROID_HOST_OUT/bin/aidegen framework
3. check import static android.Manifest.permission.BIND_VOICE_INTERACTION;
denpendency should be resolved in frameworks/base/services/core/java/com/android/server/am/ActivityManagerService.java
Change-Id: I8f24f3a3476e125d3fd808e0047db425e15046ac
Diffstat (limited to 'java/jdeps.go')
| -rw-r--r-- | java/jdeps.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/jdeps.go b/java/jdeps.go index c7fa42ae..2eaeab8b 100644 --- a/java/jdeps.go +++ b/java/jdeps.go @@ -78,9 +78,9 @@ func (j *jdepsGeneratorSingleton) GenerateBuildActions(ctx android.SingletonCont if data.Class != "" { dpInfo.Classes = append(dpInfo.Classes, data.Class) } - out := data.OutputFile.String() - if out != "" { - dpInfo.Installed_paths = append(dpInfo.Installed_paths, out) + + if dep, ok := module.(Dependency); ok { + dpInfo.Installed_paths = append(dpInfo.Installed_paths, dep.ImplementationJars().Strings()...) } dpInfo.Classes = android.FirstUniqueStrings(dpInfo.Classes) dpInfo.Installed_paths = android.FirstUniqueStrings(dpInfo.Installed_paths) |