diff options
| author | 2024-03-22 18:16:57 +0000 | |
|---|---|---|
| committer | 2024-03-22 18:16:57 +0000 | |
| commit | 44841aada36a7098182fe719d352a4c6801e496e (patch) | |
| tree | 4b46fc870e843f482a2e88851cc0c6b82942e261 /java/androidmk.go | |
| parent | c6c9c7354bb9c8b8e69f21141e79d682bbe51076 (diff) | |
Revert "Support transitive dependencies through android_libary_i..."
Revert submission 3008874
Reason for revert: b/330903911
Reverted changes: /q/submissionid:3008874
Change-Id: Ie056a7f90803ab2d8e39e07eddf6c9c68e41ff3d
Diffstat (limited to 'java/androidmk.go')
| -rw-r--r-- | java/androidmk.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/androidmk.go b/java/androidmk.go index e1b4efd7a..498962f88 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -262,13 +262,13 @@ func (prebuilt *AARImport) AndroidMkEntries() []android.AndroidMkEntries { } return []android.AndroidMkEntries{android.AndroidMkEntries{ Class: "JAVA_LIBRARIES", - OutputFile: android.OptionalPathForPath(prebuilt.implementationJarFile), + OutputFile: android.OptionalPathForPath(prebuilt.classpathFile), Include: "$(BUILD_SYSTEM)/soong_java_prebuilt.mk", ExtraEntries: []android.AndroidMkExtraEntriesFunc{ func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) { entries.SetBool("LOCAL_UNINSTALLABLE_MODULE", true) - entries.SetPath("LOCAL_SOONG_HEADER_JAR", prebuilt.headerJarFile) - entries.SetPath("LOCAL_SOONG_CLASSES_JAR", prebuilt.implementationJarFile) + entries.SetPath("LOCAL_SOONG_HEADER_JAR", prebuilt.classpathFile) + entries.SetPath("LOCAL_SOONG_CLASSES_JAR", prebuilt.classpathFile) entries.SetPath("LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE", prebuilt.exportPackage) entries.SetPath("LOCAL_SOONG_TRANSITIVE_RES_PACKAGES", prebuilt.transitiveAaptResourcePackagesFile) entries.SetPath("LOCAL_SOONG_EXPORT_PROGUARD_FLAGS", prebuilt.proguardFlags) |