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
This commit is contained in:
shinwang
2018-12-21 14:52:21 +08:00
committed by Shin Wang
parent 539f409d78
commit 7f1b38fa83

View File

@@ -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)