Merge "Introduce framework-minus-apex and create jobscheduler-framework.jar" (3fedfcb4) · Commits · e / os / android_frameworks_base

Android.bp

+44 −27

Original line number	Diff line number	Diff line
		@@ -25,8 +25,36 @@
		//
		// READ ME: ########################################################

		java_defaults {
		name: "framework-aidl-export-defaults",

		aidl: {
		export_include_dirs: [
		// From build/make/core/pathmap.mk FRAMEWORK_BASE_SUBDIRS
		"core/java",
		"graphics/java",
		"location/java",
		"lowpan/java",
		"media/java",
		"media/apex/java",
		"media/mca/effect/java",
		"media/mca/filterfw/java",
		"media/mca/filterpacks/java",
		"drm/java",
		"opengl/java",
		"sax/java",
		"telecomm/java",
		"telephony/java",
		"wifi/java",
		"keystore/java",
		"rs/java",
		],
		},
		}

		java_defaults {
		name: "framework-defaults",
		defaults: ["framework-aidl-export-defaults"],
		installable: true,

		srcs: [
		@@ -78,9 +106,6 @@ java_defaults {
		"core/java/android/app/ISearchManagerCallback.aidl",
		"core/java/android/app/IServiceConnection.aidl",
		"core/java/android/app/IStopUserCallback.aidl",
		"core/java/android/app/job/IJobCallback.aidl",
		"core/java/android/app/job/IJobScheduler.aidl",
		"core/java/android/app/job/IJobService.aidl",
		"core/java/android/app/ITransientNotification.aidl",
		"core/java/android/app/IUidObserver.aidl",
		"core/java/android/app/IUiAutomationConnection.aidl",
		@@ -702,27 +727,6 @@ java_defaults {
		],

		aidl: {
		export_include_dirs: [
		// From build/make/core/pathmap.mk FRAMEWORK_BASE_SUBDIRS
		"core/java",
		"graphics/java",
		"location/java",
		"lowpan/java",
		"media/java",
		"media/apex/java",
		"media/mca/effect/java",
		"media/mca/filterfw/java",
		"media/mca/filterpacks/java",
		"drm/java",
		"opengl/java",
		"sax/java",
		"telecomm/java",
		"telephony/java",
		"wifi/java",
		"keystore/java",
		"rs/java",
		],

		include_dirs: [
		"system/update_engine/binder_bindings",
		"frameworks/native/aidl/binder",
		@@ -838,7 +842,7 @@ filegroup {
		}

		java_library {
		name: "framework",
		name: "framework-minus-apex",
		defaults: ["framework-defaults"],
		javac_shard_size: 150,
		required: [
		@@ -847,6 +851,17 @@ java_library {
		],
		}

		java_library {
		name: "framework",
		defaults: ["framework-aidl-export-defaults"],
		installable: true,
		static_libs: [
		"framework-minus-apex",
		"jobscheduler-framework",
		],
		sdk_version: "core_platform",
		}

		java_library {
		name: "framework-annotation-proc",
		defaults: ["framework-defaults"],
		@@ -1371,8 +1386,9 @@ stubs_defaults {
		":updatable-media-srcs-without-aidls",
		"test-mock/src/*/.java",
		"test-runner/src/*/.java",
		":jobscheduler-framework-source",
		],
		srcs_lib: "framework",
		srcs_lib: "framework-minus-apex",
		srcs_lib_whitelist_dirs: frameworks_base_subdirs,
		srcs_lib_whitelist_pkgs: packages_to_document,
		libs: framework_docs_only_libs,
		@@ -1428,8 +1444,9 @@ stubs_defaults {
		":opt-net-voip-srcs",
		":core_public_api_files",
		":updatable-media-srcs-without-aidls",
		":jobscheduler-framework-source",
		],
		srcs_lib: "framework",
		srcs_lib: "framework-minus-apex",
		srcs_lib_whitelist_dirs: frameworks_base_subdirs,
		srcs_lib_whitelist_pkgs: packages_to_document,
		local_sourcepaths: frameworks_base_subdirs,

apex/jobscheduler/framework/Android.bp

0 → 100644

+29 −0

Original line number	Diff line number	Diff line
		filegroup {
		name: "jobscheduler-framework-source",
		srcs: [
		"java/*/.java",
		"java/android/app/job/IJobCallback.aidl",
		"java/android/app/job/IJobScheduler.aidl",
		"java/android/app/job/IJobService.aidl",
		],
		path: "java",
		}

		java_library {
		name: "jobscheduler-framework",
		installable: true,
		sdk_version: "core_platform",

		srcs: [
		":jobscheduler-framework-source",
		],

		aidl: {
		export_include_dirs: [
		"java",
		],
		},
		libs: [
		"framework-minus-apex",
		],
		}

core/java/android/app/JobSchedulerImpl.java→apex/jobscheduler/framework/java/android/app/JobSchedulerImpl.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -14,7 +14,6 @@
		* limitations under the License.
		*/

		// in android.app so ContextImpl has package access
		package android.app;

		import android.app.job.IJobScheduler;
		@@ -27,10 +26,12 @@ import android.os.RemoteException;
		import java.util.List;


		// APEX NOTE: Class path referred to by robolectric, so can't move it.

		/**
		* Concrete implementation of the JobScheduler interface
		*
		* Note android.app.job is the better package to put this class, but we can't move it there
		* because that'd break robolectric. Grr.
		*
		* @hide
		*/
		public class JobSchedulerImpl extends JobScheduler {

core/java/android/app/job/IJobCallback.aidl→apex/jobscheduler/framework/java/android/app/job/IJobCallback.aidl

+0 −0

File moved.

View file

core/java/android/app/job/IJobScheduler.aidl→apex/jobscheduler/framework/java/android/app/job/IJobScheduler.aidl

+0 −0

File moved.

View file