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

Commit 4616ec7e authored by Iván Budnik's avatar Iván Budnik Committed by Gerrit Code Review
Browse files

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

Revert submission 2462194-androidmk_for_apex_dependencies

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=full-eng&lkgb=9723453&lkbb=9724944&fkbb=9723508, bug b/272663333.

Reverted changes: /q/submissionid:2462194-androidmk_for_apex_dependencies

Bug: 272663333
Change-Id: Iecf99713133b2bc8f35614b6b9596422dc051198
parent a3763c18

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 :=