Merge Android Pie into master (40a1c33e) · Commits · e / os / android_packages_apps_Settings

Android.mk

+9 −2

Original line number	Diff line number	Diff line
		@@ -21,13 +21,17 @@ LOCAL_USE_AAPT2 := true
		LOCAL_SRC_FILES := $(call all-java-files-under, src)

		LOCAL_STATIC_ANDROID_LIBRARIES := \
		android-slices-builders \
		android-slices-core \
		android-slices-view \
		android-support-compat \
		android-support-v4 \
		android-support-v13 \
		android-support-v7-appcompat \
		android-support-v7-cardview \
		android-support-v7-preference \
		android-support-v7-recyclerview \
		android-support-v14-preference
		android-support-v14-preference \

		LOCAL_JAVA_LIBRARIES := \
		bouncycastle \
		@@ -35,8 +39,11 @@ LOCAL_JAVA_LIBRARIES := \
		ims-common

		LOCAL_STATIC_JAVA_LIBRARIES := \
		android-arch-lifecycle-runtime \
		android-arch-lifecycle-extensions \
		guava \
		jsr305 \
		settings-logtags
		settings-logtags \

		LOCAL_PROGUARD_FLAG_FILES := proguard.flags

+821 −789

File changed.

Preview size limit exceeded, changes collapsed.

+7 −0

Original line number	Diff line number	Diff line
		# Use this reviewer by default.
		pixel-sw-exp-reviews+gerrit@google.com

		# People who can approve changes for submission
		asapperstein@google.com
		asargent@google.com
		dehboxturtle@google.com
		@@ -9,3 +13,6 @@ zhfan@google.com

		# Emergency approvers in case the above are not available
		miket@google.com

		# Exempt resource files (because they are in a flat directory and too hard to manage via OWNERS)
		per-file .xml=
		No newline at end of file

+3 −2

Original line number	Diff line number	Diff line
		[Hook Scripts]
		checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}
		-fw src/com/android/settings/print/
		checkcolor_hook = ${REPO_ROOT}/prebuilts/checkcolor/checkcolor.py -p .

		strings_lint_hook = ${REPO_ROOT}/frameworks/base/tools/stringslint/stringslint_sha.sh ${PREUPLOAD_COMMIT}

0 → 100644

+2948 −0

File added.

Preview size limit exceeded, changes collapsed.