diff options
| author | Colin Cross <ccross@android.com> | 2020-07-17 22:16:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-07-17 22:16:01 +0000 |
| commit | 89cf3cf5728ff2debbd77f2131d211952299df6a (patch) | |
| tree | c0f2b9ba5bbac4ae964d00ae15f2b4ea70540486 | |
| parent | 1db45ef2a216491f0e27769f43204f4fc1b73668 (diff) | |
| parent | 8d2183f461dbc54045f4a78eb1ba4527b43c7c78 (diff) | |
| download | build-89cf3cf5728ff2debbd77f2131d211952299df6a.tar.gz | |
Merge "Install symbols for JNI libraries" into rvc-dev
| -rw-r--r-- | core/clear_vars.mk | 1 | ||||
| -rw-r--r-- | core/soong_app_prebuilt.mk | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/core/clear_vars.mk b/core/clear_vars.mk index f56be136fe..ebdb6631cd 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -342,6 +342,7 @@ LOCAL_PREBUILT_JNI_LIBS_$(TARGET_ARCH):= LOCAL_REQUIRED_MODULES_$(TARGET_ARCH):= LOCAL_SHARED_LIBRARIES_$(TARGET_ARCH):= LOCAL_SOONG_JNI_LIBS_$(TARGET_ARCH):= +LOCAL_SOONG_JNI_LIBS_SYMBOLS:= LOCAL_SRC_FILES_EXCLUDE_$(TARGET_ARCH):= LOCAL_SRC_FILES_$(TARGET_ARCH):= LOCAL_STATIC_LIBRARIES_$(TARGET_ARCH):= diff --git a/core/soong_app_prebuilt.mk b/core/soong_app_prebuilt.mk index faeb8ce44f..4616ad098f 100644 --- a/core/soong_app_prebuilt.mk +++ b/core/soong_app_prebuilt.mk @@ -11,6 +11,7 @@ # LOCAL_SOONG_RRO_DIRS # LOCAL_SOONG_JNI_LIBS_$(TARGET_ARCH) # LOCAL_SOONG_JNI_LIBS_$(TARGET_2ND_ARCH) +# LOCAL_SOONG_JNI_LIBS_SYMBOLS ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK)) $(call pretty-error,soong_app_prebuilt.mk may only be used from Soong) @@ -118,6 +119,11 @@ $(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \ $(call create-suite-dependencies) endif +# install symbol files of JNI libraries +my_jni_lib_symbols_copy_files := $(foreach f,$(LOCAL_SOONG_JNI_LIBS_SYMBOLS),\ + $(call word-colon,1,$(f)):$(patsubst $(PRODUCT_OUT)/%,$(TARGET_OUT_UNSTRIPPED)/%,$(call word-colon,2,$(f)))) +$(LOCAL_BUILT_MODULE): $(call copy-many-files, $(my_jni_lib_symbols_copy_files)) + # embedded JNI will already have been handled by soong my_embed_jni := my_prebuilt_jni_libs := |