resolve merge conflicts of 94c54dcee6a9728d63cef63c215d3ebd2de83831 to qt-r1-dev-plus-aosp (0c859fa4) · Commits · e / os / android_frameworks_base

Android.bp

+3 −2

Original line number	Diff line number	Diff line
		@@ -102,10 +102,8 @@ framework_srcs = [

		// etc.
		"core/java/*/.logtags",
		":apex-properties",
		":framework-javastream-protos",
		":framework-statslog-gen",
		":platform-properties",
		]

		framework_aidl_local_include_dirs = [
		@@ -208,6 +206,9 @@ java_defaults {
		"android.hardware.vibrator-V1.3-java",
		"android.hardware.wifi-V1.0-java-constants",
		"devicepolicyprotosnano",

		"com.android.sysprop.apex",
		"PlatformProperties",
		],

		required: [