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

Commit 0217e3b2 authored by Ying Wang's avatar Ying Wang
Browse files

resolved conflicts for merge of a4f415d6 to lmp-mr1-dev-plus-aosp 

Change-Id: Ibb54bce20342bd386ec85388d48c1c08e8b80197
parents 9a186a1c a4f415d6

core/clear_vars.mk

+2 −0
Original line number Diff line number Diff line
@@ -167,6 +167,8 @@ LOCAL_MODULE_HOST_ARCH:= 
LOCAL_NO_FPIE :=

LOCAL_CXX_STL := default

LOCAL_NATIVE_COVERAGE :=

LOCAL_DPI_VARIANTS:=

LOCAL_DPI_FILE_STEM:=



# arch specific variables

LOCAL_SRC_FILES_$(TARGET_ARCH):=

core/prebuilt_internal.mk

+13 −0
Original line number Diff line number Diff line
@@ -117,6 +117,19 @@ endif # LOCAL_STRIP_MODULE not true 
ifeq ($(LOCAL_MODULE_CLASS),APPS)

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 :=

include $(BUILD_SYSTEM)/install_jni_libs.mk