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"" am: 1c117c5fab am: 4b17107fe3

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2481060

Change-Id: I7b6fda015713093840a1d567f2b196620aab6cf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Iván Budnik
2023-03-10 17:23:18 +00:00
committed by Automerger Merge Worker
parent 6f57b6d309 4b17107fe3
commit 9e3c1085a5
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/soong_app_prebuilt.mk
View File

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