commit 1c117c5faba9dc1a7e23ec1a5e6b3b742e478782
author Iván Budnik <ivanbuper@google.com> Fri Mar 10 16:30:32 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 10 16:30:32 2023 +0000
tree 984e1a1660b20c395eb0b5b56c3a2af374c25502
parent 82308a21a3ea7cf59c121851c57091aff915e874
parent 4616ec7eb7fa7de854703d66e55b95ba598eb5e9

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

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