Merge "Fix a workaround for "required" property bug." (b6a17aaa) · Commits · e / os / android_frameworks_base

Android.bp

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -234,6 +234,11 @@ java_defaults {
	"wifi/java",		"wifi/java",
	],		],
	},		},

			required: [
			// TODO: remove gps_debug when the build system propagates "required" properly.
			"gps_debug.conf",
			],
	}		}

	// Collection of classes that are generated from non-Java files that are not listed in		// Collection of classes that are generated from non-Java files that are not listed in
	@@ -307,11 +312,6 @@ java_defaults {

	static_libs: ["framework-internal-utils"],		static_libs: ["framework-internal-utils"],

	required: [
	// TODO: remove gps_debug when the build system propagates "required" properly.
	"gps_debug.conf",
	],

	dxflags: [		dxflags: [
	"--core-library",		"--core-library",
	"--multi-dex",		"--multi-dex",