Merge "Remove repackaged.android.test.mock" (8b7ac496) · Commits · e / os / android_frameworks_base

test-mock/Android.bp

+0 −13

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@
		java_library {
		name: "android.test.mock",

		// Needs to be consistent with the repackaged version of this make target.
		java_version: "1.8",
		srcs: ["src/*/.java"],

		@@ -28,15 +27,3 @@ java_library {
		"framework",
		],
		}

		// Build the repackaged.android.test.mock library
		// ==============================================
		java_library_static {
		name: "repackaged.android.test.mock",

		static_libs: ["android.test.mock"],

		jarjar_rules: "jarjar-rules.txt",
		// Pin java_version until jarjar is certified to support later versions. http://b/72703434
		java_version: "1.8",
		}

+15 −2

Original line number	Diff line number	Diff line
		@@ -56,8 +56,21 @@ java_library {
		java_library_static {
		name: "repackaged.android.test.runner",

		srcs: ["src/*/.java"],
		exclude_srcs: [
		"src/android/test/ActivityUnitTestCase.java",
		"src/android/test/ApplicationTestCase.java",
		"src/android/test/IsolatedContext.java",
		"src/android/test/ProviderTestCase.java",
		"src/android/test/ProviderTestCase2.java",
		"src/android/test/RenamingDelegatingContext.java",
		"src/android/test/ServiceTestCase.java",
		],

		sdk_version: "current",
		static_libs: ["android.test.runner"],
		libs: [
		"android.test.base",
		],

		jarjar_rules: "jarjar-rules.txt",
		// Pin java_version until jarjar is certified to support later versions. http://b/72703434