Merge "Don't install jni libs for uninstallable modules"

This commit is contained in:
Cole Faust
2023-03-10 06:36:03 +00:00
committed by Gerrit Code Review

View File

@@ -162,6 +162,7 @@ $(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 :=
ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE))
ifdef LOCAL_SOONG_JNI_LIBS_$(TARGET_ARCH)
my_2nd_arch_prefix :=
LOCAL_JNI_SHARED_LIBRARIES := $(LOCAL_SOONG_JNI_LIBS_$(TARGET_ARCH))
@@ -176,6 +177,7 @@ ifdef TARGET_2ND_ARCH
include $(BUILD_SYSTEM)/install_jni_libs_internal.mk
endif
endif
endif
LOCAL_SHARED_JNI_LIBRARIES :=
my_embed_jni :=
my_prebuilt_jni_libs :=