Merge "Change deptag for sdk deps to help distinguish"

2022-09-30 22:56:36 +00:00
parent d0c8d54f29 ef28a4c5ce
commit dfd50cc813
5 changed files with 22 additions and 13 deletions
--- a/java/aar.go
+++ b/java/aar.go
@@ -440,7 +440,7 @@ func aaptLibs(ctx android.ModuleContext, sdkContext android.SdkContext, classLoa
 		switch depTag {
 		case instrumentationForTag:
 			// Nothing, instrumentationForTag is treated as libTag for javac but not for aapt2.
-		case libTag:
+		case sdkLibTag, libTag:
 			if exportPackage != nil {
 				sharedLibs = append(sharedLibs, exportPackage)
 			}