From ac30b88dc41e7c54866e6f3101e48bc404f29843 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Fri, 25 Sep 2015 16:06:48 -0700 Subject: [PATCH] Remove the unnecessary rs_compatibility_jni_libs install rules. We only build rs_compatibility_jni_libs for unbundled build or when FORCE_BUILD_RS_COMPAT is set. We don't need to install the rs_compatibility_jni_libs to system.img in either case. It's bad idea to install them to system.img, because when two modules have .rs files with the same name, their installed files conflict. Change-Id: I7524a301c59396db464f28b17b8f8bf1f15523ca --- core/clear_vars.mk | 1 - core/java.mk | 22 ---------------------- 2 files changed, 23 deletions(-) diff --git a/core/clear_vars.mk b/core/clear_vars.mk index d0d4ff9e33..f4f96d8cfb 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -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:= diff --git a/core/java.mk b/core/java.mk index f3b57b81de..66825d1926 100644 --- a/core/java.mk +++ b/core/java.mk @@ -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)