Merge "Correct directory location." into pi-dev (ffc100e6) · Commits · e / os / android_frameworks_base

packages/SettingsLib/common.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ endif

		# Include android-support-v7-preference, if not already included
		ifeq (,$(findstring android-support-v7-preference,$(LOCAL_STATIC_JAVA_LIBRARIES)))
		LOCAL_RESOURCE_DIR += frameworks/support/v7/preference/res
		LOCAL_RESOURCE_DIR += frameworks/support/preference/res
		LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.preference
		LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-preference
		endif