Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2738c346 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Install symbols for JNI libraries"

parents 7c16b443 e926cab3

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -340,6 +340,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):=

core/soong_app_prebuilt.mk

+6 −0
Original line number Diff line number Diff line
@@ -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 :=