diff options
| author | Iván Budnik <ivanbuper@google.com> | 2023-03-10 16:11:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-03-10 16:11:31 +0000 |
| commit | 4616ec7eb7fa7de854703d66e55b95ba598eb5e9 (patch) | |
| tree | 84a7de1e5ee05e480d5d5a61cddce1114befad0a | |
| parent | a3763c18ef47a29f7b8317ad7096d82c89b41885 (diff) | |
| download | build-4616ec7eb7fa7de854703d66e55b95ba598eb5e9.tar.gz | |
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
| -rw-r--r-- | core/soong_app_prebuilt.mk | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/core/soong_app_prebuilt.mk b/core/soong_app_prebuilt.mk index 469a8f1bd7..786a755b35 100644 --- a/core/soong_app_prebuilt.mk +++ b/core/soong_app_prebuilt.mk @@ -162,21 +162,19 @@ $(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)) - 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 := |