resolved conflicts for merge of a4f415d6
to lmp-mr1-dev-plus-aosp
Change-Id: Ibb54bce20342bd386ec85388d48c1c08e8b80197
This commit is contained in:
@@ -167,6 +167,8 @@ LOCAL_MODULE_HOST_ARCH:=
|
|||||||
LOCAL_NO_FPIE :=
|
LOCAL_NO_FPIE :=
|
||||||
LOCAL_CXX_STL := default
|
LOCAL_CXX_STL := default
|
||||||
LOCAL_NATIVE_COVERAGE :=
|
LOCAL_NATIVE_COVERAGE :=
|
||||||
|
LOCAL_DPI_VARIANTS:=
|
||||||
|
LOCAL_DPI_FILE_STEM:=
|
||||||
|
|
||||||
# arch specific variables
|
# arch specific variables
|
||||||
LOCAL_SRC_FILES_$(TARGET_ARCH):=
|
LOCAL_SRC_FILES_$(TARGET_ARCH):=
|
||||||
|
@@ -117,6 +117,19 @@ endif # LOCAL_STRIP_MODULE not true
|
|||||||
ifeq ($(LOCAL_MODULE_CLASS),APPS)
|
ifeq ($(LOCAL_MODULE_CLASS),APPS)
|
||||||
PACKAGES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES))
|
PACKAGES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES))
|
||||||
|
|
||||||
|
# Select dpi-specific source
|
||||||
|
ifdef LOCAL_DPI_VARIANTS
|
||||||
|
my_dpi := $(filter $(LOCAL_DPI_VARIANTS),$(PRODUCT_AAPT_PREF_CONFIG))
|
||||||
|
ifdef my_dpi
|
||||||
|
ifdef LOCAL_DPI_FILE_STEM
|
||||||
|
my_prebuilt_dpi_file_stem := $(LOCAL_DPI_FILE_STEM)
|
||||||
|
else
|
||||||
|
my_prebuilt_dpi_file_stem := $(LOCAL_MODULE)_%.apk
|
||||||
|
endif
|
||||||
|
my_prebuilt_src_file := $(dir $(my_prebuilt_src_file))$(subst %,$(my_dpi),$(my_prebuilt_dpi_file_stem))
|
||||||
|
endif # my_dpi
|
||||||
|
endif # LOCAL_DPI_VARIANTS
|
||||||
|
|
||||||
rs_compatibility_jni_libs :=
|
rs_compatibility_jni_libs :=
|
||||||
include $(BUILD_SYSTEM)/install_jni_libs.mk
|
include $(BUILD_SYSTEM)/install_jni_libs.mk
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user