StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Iván Budnik
2023-03-10 16:30:32 +00:00
committed by Gerrit Code Review
parent 82308a21a3 4616ec7eb7
commit 1c117c5fab
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/soong_app_prebuilt.mk
View File

@@ -162,21 +162,19 @@ $(LOCAL_BUILT_MODULE): | $(call copy-many-files, $(my_jni_lib_symbols_copy_files
# embedded JNI will already have been handled by soong # embedded JNI will already have been handled by soong
my_embed_jni := my_embed_jni :=
my_prebuilt_jni_libs := my_prebuilt_jni_libs :=
ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE)) ifdef LOCAL_SOONG_JNI_LIBS_$(TARGET_ARCH)
ifdef LOCAL_SOONG_JNI_LIBS_$(TARGET_ARCH) my_2nd_arch_prefix :=
my_2nd_arch_prefix := LOCAL_JNI_SHARED_LIBRARIES := $(LOCAL_SOONG_JNI_LIBS_$(TARGET_ARCH))
LOCAL_JNI_SHARED_LIBRARIES := $(LOCAL_SOONG_JNI_LIBS_$(TARGET_ARCH)) partition_lib_pairs := $(LOCAL_SOONG_JNI_LIBS_PARTITION_$(TARGET_ARCH))
partition_lib_pairs := $(LOCAL_SOONG_JNI_LIBS_PARTITION_$(TARGET_ARCH)) include $(BUILD_SYSTEM)/install_jni_libs_internal.mk
endif
ifdef TARGET_2ND_ARCH
ifdef LOCAL_SOONG_JNI_LIBS_$(TARGET_2ND_ARCH)
my_2nd_arch_prefix := $(TARGET_2ND_ARCH_VAR_PREFIX)
LOCAL_JNI_SHARED_LIBRARIES := $(LOCAL_SOONG_JNI_LIBS_$(TARGET_2ND_ARCH))
partition_lib_pairs := $(LOCAL_SOONG_JNI_LIBS_PARTITION_$(TARGET_2ND_ARCH))
include $(BUILD_SYSTEM)/install_jni_libs_internal.mk include $(BUILD_SYSTEM)/install_jni_libs_internal.mk
endif endif
ifdef TARGET_2ND_ARCH
ifdef LOCAL_SOONG_JNI_LIBS_$(TARGET_2ND_ARCH)
my_2nd_arch_prefix := $(TARGET_2ND_ARCH_VAR_PREFIX)
LOCAL_JNI_SHARED_LIBRARIES := $(LOCAL_SOONG_JNI_LIBS_$(TARGET_2ND_ARCH))
partition_lib_pairs := $(LOCAL_SOONG_JNI_LIBS_PARTITION_$(TARGET_2ND_ARCH))
include $(BUILD_SYSTEM)/install_jni_libs_internal.mk
endif
endif
endif endif
LOCAL_SHARED_JNI_LIBRARIES := LOCAL_SHARED_JNI_LIBRARIES :=
my_embed_jni := my_embed_jni :=