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

Commit 094116f0 authored by Ying Wang's avatar Ying Wang Committed by Gerrit Code Review
Browse files

Merge "Remove the unnecessary rs_compatibility_jni_libs install rules."

parents aaa9d8dc ac30b88d

core/clear_vars.mk

+0 −1
Original line number Diff line number Diff line
@@ -133,7 +133,6 @@ LOCAL_RENDERSCRIPT_INCLUDES_OVERRIDE:= 
LOCAL_RENDERSCRIPT_CC:=

LOCAL_RENDERSCRIPT_COMPATIBILITY:=

LOCAL_RENDERSCRIPT_FLAGS:=

LOCAL_RENDERSCRIPT_SKIP_INSTALL:=

LOCAL_RENDERSCRIPT_TARGET_API:=

LOCAL_DEX_PREOPT:= # '',true,false,nostripping

LOCAL_DEX_PREOPT_IMAGE_LOCATION:=

core/java.mk

+0 −22
Original line number Diff line number Diff line
@@ -353,28 +353,6 @@ $(error $(LOCAL_PATH): Target java module does not define any source or resource 
endif

endif



# Install the RS compatibility libraries to /system/lib/ if necessary

ifdef rs_compatibility_jni_libs

installed_rs_compatibility_jni_libs := $(addprefix $(TARGET_OUT_SHARED_LIBRARIES)/,\

    $(notdir $(rs_compatibility_jni_libs)))

# Provide a way to skip sources included in multiple projects.

ifdef LOCAL_RENDERSCRIPT_SKIP_INSTALL

skip_install_rs_libs := $(patsubst %.rs,%.so, \

    $(addprefix $(TARGET_OUT_SHARED_LIBRARIES)/librs., \

    $(notdir $(LOCAL_RENDERSCRIPT_SKIP_INSTALL))))

installed_rs_compatibility_jni_libs := \

    $(filter-out $(skip_install_rs_libs),$(installed_rs_compatibility_jni_libs))

endif

ifneq (,$(strip $(installed_rs_compatibility_jni_libs)))

$(installed_rs_compatibility_jni_libs) : $(TARGET_OUT_SHARED_LIBRARIES)/lib%.so : \

    $(renderscript_intermediate)/lib%.so

	$(hide) mkdir -p $(dir $@) && cp -f $< $@



# Install them only if the current module is installed.

$(LOCAL_INSTALLED_MODULE) : $(installed_rs_compatibility_jni_libs)

endif

endif



# Since we're using intermediates.COMMON, make sure that it gets cleaned

# properly.

$(cleantarget): PRIVATE_CLEAN_FILES += $(intermediates.COMMON)