diff options
| author | 2020-07-06 14:15:24 -0700 | |
|---|---|---|
| committer | 2020-07-17 19:11:05 +0000 | |
| commit | b32b71222e2ae958f8c06e415c434e4b067a8527 (patch) | |
| tree | 8e9c04a7cf1b2ade5794e83d753a7ed5494d3898 /java/androidmk.go | |
| parent | 774a7580267ec9cb898f2a64b659fd85b7209926 (diff) | |
Pass unstripped JNI libraries to Make
Pass a list of unstripped JNI libraries to Make so that they can be
installed into the symbols directory.
Bug: 159726429
Test: forrest
Change-Id: Ieb4bffbb3d0a09f476da011399c5b8b1611929d7
Merged-In: Ieb4bffbb3d0a09f476da011399c5b8b1611929d7
(cherry picked from commit 403cc15f1b01a43902a77f9d136d96303ebbe7af)
Diffstat (limited to 'java/androidmk.go')
| -rw-r--r-- | java/androidmk.go | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/java/androidmk.go b/java/androidmk.go index 8953c31c1..c69b747a5 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -370,9 +370,15 @@ func (app *AndroidApp) AndroidMkEntries() []android.AndroidMkEntries { entries.SetString("LOCAL_CERTIFICATE", app.certificate.AndroidMkString()) entries.AddStrings("LOCAL_OVERRIDES_PACKAGES", app.getOverriddenPackages()...) - for _, jniLib := range app.installJniLibs { - entries.AddStrings("LOCAL_SOONG_JNI_LIBS_"+jniLib.target.Arch.ArchType.String(), jniLib.name) + if app.embeddedJniLibs { + jniSymbols := app.JNISymbolsInstalls(app.installPathForJNISymbols.String()) + entries.SetString("LOCAL_SOONG_JNI_LIBS_SYMBOLS", jniSymbols.String()) + } else { + for _, jniLib := range app.jniLibs { + entries.AddStrings("LOCAL_SOONG_JNI_LIBS_"+jniLib.target.Arch.ArchType.String(), jniLib.name) + } } + if len(app.jniCoverageOutputs) > 0 { entries.AddStrings("LOCAL_PREBUILT_COVERAGE_ARCHIVE", app.jniCoverageOutputs.Strings()...) } |