Merge "Revert "Tweak app makefile with extra resources"" into oc-dev (fb63fc2c) · Commits · e / os / android_packages_apps_Dialer

Android.mk

+11 −7

Original line number	Diff line number	Diff line
		@@ -7,6 +7,12 @@
		LOCAL_PATH:= $(call my-dir)
		include $(CLEAR_VARS)

		ifeq ($(TARGET_BUILD_APPS),)
		support_library_root_dir := frameworks/support
		else
		support_library_root_dir := prebuilts/sdk/current/support
		endif

		# The base directory for Dialer sources.
		BASE_DIR := java/com/android

		@@ -146,17 +152,15 @@ LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)

		LOCAL_RESOURCE_DIR := \
		$(addprefix $(LOCAL_PATH)/, $(RES_DIRS)) \
		$(SUPPORT_LIBRARY_ROOT)/core-ui/res \
		$(SUPPORT_LIBRARY_ROOT)/design/res \
		$(SUPPORT_LIBRARY_ROOT)/transition/res \
		$(SUPPORT_LIBRARY_ROOT)/v7/appcompat/res \
		$(SUPPORT_LIBRARY_ROOT)/v7/cardview/res \
		$(SUPPORT_LIBRARY_ROOT)/v7/recyclerview/res
		$(support_library_root_dir)/design/res \
		$(support_library_root_dir)/transition/res \
		$(support_library_root_dir)/v7/appcompat/res \
		$(support_library_root_dir)/v7/cardview/res \
		$(support_library_root_dir)/v7/recyclerview/res

		# We specify each package explicitly to glob resource files.
		LOCAL_AAPT_FLAGS := \
		--auto-add-overlay \
		--extra-packages android.support.coreui \
		--extra-packages com.android.contacts.common \
		--extra-packages com.android.dialer.about \
		--extra-packages com.android.dialer.app \