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

Commit d8883862 authored by Anton Hansson's avatar Anton Hansson Committed by android-build-merger
Browse files

Merge "Indent the install_jni_libs makefiles"

am: 6de8abc9

Change-Id: I4c54d83d362c7f686bb5382a875f49a52d57ae42
parents 2045faa8 6de8abc9
Loading
Loading
Loading
Loading
+88 −88
Original line number Diff line number Diff line
@@ -12,9 +12,9 @@
#   my_embedded_prebuilt_jni_libs, prebuilt jni libs embedded in prebuilt apk.
#

my_jni_shared_libraries := \
my_jni_shared_libraries := $(strip \
    $(foreach lib,$(LOCAL_JNI_SHARED_LIBRARIES), \
      $(call intermediates-dir-for,SHARED_LIBRARIES,$(lib),,,$(my_2nd_arch_prefix))/$(lib).so)
      $(call intermediates-dir-for,SHARED_LIBRARIES,$(lib),,,$(my_2nd_arch_prefix))/$(lib).so))

# App-specific lib path.
my_app_lib_path := $(dir $(LOCAL_INSTALLED_MODULE))lib/$(TARGET_$(my_2nd_arch_prefix)ARCH)
@@ -41,18 +41,17 @@ else
    my_jni_shared_libraries_abi := $(LOCAL_JNI_SHARED_LIBRARIES_ABI)
  endif

else  # not my_embed_jni
else ifneq ($(my_jni_shared_libraries),) # not my_embed_jni

my_jni_shared_libraries := $(strip $(my_jni_shared_libraries))
ifneq ($(my_jni_shared_libraries),)
  # The jni libaries will be installed to the system.img.
  my_jni_filenames := $(notdir $(my_jni_shared_libraries))
  # Make sure the JNI libraries get installed
  my_shared_library_path := $(call get_non_asan_path,\
      $($(my_2nd_arch_prefix)TARGET_OUT$(partition_tag)_SHARED_LIBRARIES))
# Do not use order-only dependency, because we want to rebuild the image if an jni is updated.
  my_installed_library := $(addprefix $(my_shared_library_path)/, $(my_jni_filenames))
  # Do not use order-only dependency, because we want to rebuild the image if an jni is updated.
  $(LOCAL_INSTALLED_MODULE) : $(my_installed_library)

  ALL_MODULES.$(LOCAL_MODULE).INSTALLED += $(my_installed_library)

  # Create symlink in the app specific lib path
@@ -77,7 +76,6 @@ endif

  # Clear jni_shared_libraries to not embed it into the apk.
  my_jni_shared_libraries :=
endif  # $(my_jni_shared_libraries) not empty
endif  # my_embed_jni

ifdef my_prebuilt_jni_libs
@@ -100,6 +98,7 @@ $(foreach lib, $(my_prebuilt_jni_libs), \

      my_installed_library := $(addprefix $(my_app_lib_path)/, $(notdir $(my_prebuilt_jni_libs)))
      $(LOCAL_INSTALLED_MODULE) : $(my_installed_library)

      ALL_MODULES.$(LOCAL_MODULE).INSTALLED += $(my_installed_library)
    endif  # my_embed_jni
  endif  # inner my_prebuilt_jni_libs
@@ -107,6 +106,7 @@ endif # outer my_prebuilt_jni_libs

# Verify that all included libraries are built against the NDK
include $(BUILD_SYSTEM)/allowed_ndk_types.mk

ifneq ($(strip $(LOCAL_JNI_SHARED_LIBRARIES)),)
  ifneq ($(LOCAL_SDK_VERSION),)
    my_link_type := app:sdk
+43 −43

File changed.

Contains only whitespace changes.