commit 4616ec7eb7fa7de854703d66e55b95ba598eb5e9
author Iván Budnik <ivanbuper@google.com> Fri Mar 10 16:11:26 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 10 16:11:31 2023 +0000
tree 84a7de1e5ee05e480d5d5a61cddce1114befad0a
parent a3763c18ef47a29f7b8317ad7096d82c89b41885

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

core/soong_app_prebuilt.mk

diff --git a/core/soong_app_prebuilt.mk b/core/soong_app_prebuilt.mk
index 469a8f1..786a755 100644
--- a/core/soong_app_prebuilt.mk
+++ b/core/soong_app_prebuilt.mk
@@ -162,21 +162,19 @@
 # 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))
-    partition_lib_pairs :=  $(LOCAL_SOONG_JNI_LIBS_PARTITION_$(TARGET_ARCH))
+ifdef LOCAL_SOONG_JNI_LIBS_$(TARGET_ARCH)
+  my_2nd_arch_prefix :=
+  LOCAL_JNI_SHARED_LIBRARIES := $(LOCAL_SOONG_JNI_LIBS_$(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
   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
 LOCAL_SHARED_JNI_LIBRARIES :=
 my_embed_jni :=