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

Commit 99d04924 authored by Ta-wei Yen's avatar Ta-wei Yen Committed by android-build-merger
Browse files

Merge "Allow google dialer code to be compiled against M and N SDKs" into ub-contactsdialer-b-dev 

am: 05fe8dad

* commit '05fe8dad':
  Allow google dialer code to be compiled against M and N SDKs
parents 27356bd8 05fe8dad

Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ src_dirs := src $(contacts_common_dir)/src $(phone_common_dir)/src 
res_dirs := res $(contacts_common_dir)/res $(phone_common_dir)/res

asset_dirs := $(contacts_common_dir)/assets



src_dirs += src-N $(contacts_common_dir)/src-N $(phone_common_dir)/src-N



LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))

LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) \

    $(support_library_root_dir)/v7/appcompat/res \