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

Commit 4b17107f authored by Iván Budnik's avatar Iván Budnik Committed by Automerger Merge Worker
Browse files

Merge "Revert "Don't install jni libs for uninstallable modules"" am: 1c117c5f 

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



Change-Id: I181241288de1c5e261f01c8acee1ea7cd179fd6f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents edd91aa2 1c117c5f

core/soong_app_prebuilt.mk

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