StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Iván Budnik
2023-03-10 16:11:26 +00:00
committed by Gerrit Code Review
parent a3763c18ef
commit 4616ec7eb7
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/soong_app_prebuilt.mk
View File

@@ -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 # 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))
@@ -177,7 +176,6 @@ ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE))
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 :=