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

Commit ce3615c9 authored by Cole Faust's avatar Cole Faust Committed by Automerger Merge Worker
Browse files

Merge "Don't install jni libs for uninstallable modules" am: c3eb995e 

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



Change-Id: Ifdb261e2f296b89743aa50a5a7c9073028006c88
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0939a08e c3eb995e

core/soong_app_prebuilt.mk

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

# 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))
@@ -176,6 +177,7 @@ ifdef TARGET_2ND_ARCH 
      include $(BUILD_SYSTEM)/install_jni_libs_internal.mk

      include $(BUILD_SYSTEM)/install_jni_libs_internal.mk

    endif

    endif

  endif

  endif

endif

LOCAL_SHARED_JNI_LIBRARIES :=

LOCAL_SHARED_JNI_LIBRARIES :=

my_embed_jni :=

my_embed_jni :=

my_prebuilt_jni_libs :=

my_prebuilt_jni_libs :=