Merge "Pass unstripped JNI libraries to Make" am: bf81ed4fd1 am: 9a6d827dc3

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1356262 Change-Id: I99a111aafcab5a8a8a5b704b9dd67904c93b0aea
2020-07-16 23:19:16 +00:00
parent ac0bcec21f 9a6d827dc3
commit 0add164d0e
4 changed files with 55 additions and 20 deletions
--- a/java/java.go
+++ b/java/java.go
@@ -639,10 +639,11 @@ func (s sdkDep) hasFrameworkLibs() bool {
 }

 type jniLib struct {
-	name         string
-	path         android.Path
-	target       android.Target
-	coverageFile android.OptionalPath
+	name           string
+	path           android.Path
+	target         android.Target
+	coverageFile   android.OptionalPath
+	unstrippedFile android.Path
 }

 func (j *Module) shouldInstrument(ctx android.BaseModuleContext) bool {