Merge "Initial boilerplate for an updatable graphics jar" (1559ca98) · Commits · e / os / android_frameworks_base

Android.bp

+4 −2

Original line number	Diff line number	Diff line
		@@ -65,7 +65,7 @@ filegroup {
		}

		filegroup {
		name: "framework-graphics-sources",
		name: "framework-graphics-nonupdatable-sources",
		srcs: [
		"graphics/java/*/.java",
		"graphics/java/*/.aidl",
		@@ -223,7 +223,7 @@ filegroup {
		":framework-blobstore-sources",
		":framework-core-sources",
		":framework-drm-sources",
		":framework-graphics-sources",
		":framework-graphics-nonupdatable-sources",
		":framework-jobscheduler-sources", // jobscheduler is not a module for R
		":framework-keystore-sources",
		":framework-identity-sources",
		@@ -283,6 +283,7 @@ filegroup {
		name: "framework-updatable-sources",
		srcs: [
		":framework-appsearch-sources",
		":framework-graphics-srcs",
		":framework-mediaprovider-sources",
		":framework-permission-sources",
		":framework-sdkextensions-sources",
		@@ -297,6 +298,7 @@ java_library {
		name: "framework-updatable-stubs-module_libs_api",
		static_libs: [
		"framework-appsearch-stubs", // TODO: Update to module_libs_api when there is one.
		"framework-graphics-stubs-module_libs_api",
		"framework-media-stubs-module_libs_api",
		"framework-mediaprovider-stubs-module_libs_api",
		"framework-permission-stubs-module_libs_api",

libs/hwui/Android.bp

+101 −0

Original line number	Diff line number	Diff line
		@@ -152,6 +152,107 @@ cc_defaults {
		},
		}

		// ------------------------
		// framework-graphics jar
		// ------------------------

		java_library {
		name: "framework-graphics",

		srcs: [
		":framework-graphics-srcs",
		],

		permitted_packages: [
		"android.graphics",
		],

		sdk_version: "module_current",

		// TODO: once framework-graphics is officially part of the
		// UI-rendering module this line would no longer be
		// needed.
		installable: true,

		// Enable detection of apis used by this module
		plugins: ["java_api_finder",],
		}

		filegroup {
		name: "framework-graphics-srcs",
		srcs: [
		"apex/java/*/.java",
		],
		path: "apex/java"
		}

		stubs_defaults {
		name: "framework-graphics-stubs-srcs-defaults",
		srcs: [ ":framework-graphics-srcs"],
		}

		droidstubs {
		name: "framework-graphics-api-module_libs_api",
		defaults: [
		"framework-graphics-stubs-srcs-defaults",
		"framework-module-api-defaults-module_libs_api",
		],
		}

		droidstubs {
		name: "framework-graphics-stubs-srcs-module_libs_api",
		defaults: [
		"framework-graphics-stubs-srcs-defaults",
		"framework-module-stubs-defaults-module_libs_api",
		],
		}

		droidstubs {
		name: "framework-graphics-stubs-srcs-publicapi",
		defaults: [
		"framework-graphics-stubs-srcs-defaults",
		"framework-module-stubs-defaults-publicapi",
		],
		}

		droidstubs {
		name: "framework-graphics-stubs-srcs-systemapi",
		defaults: [
		"framework-graphics-stubs-srcs-defaults",
		"framework-module-stubs-defaults-systemapi",
		],
		}

		java_library {
		name: "framework-graphics-stubs-module_libs_api",
		srcs: [":framework-graphics-stubs-srcs-module_libs_api"],
		sdk_version: "system_current",
		visibility: [
		"//frameworks/base", // Framework
		"//frameworks/base/libs/hwui", // UI-rendering module
		],
		}

		java_library {
		name: "framework-graphics-stubs-publicapi",
		srcs: [":framework-graphics-stubs-srcs-publicapi"],
		sdk_version: "current",
		visibility: [
		"//frameworks/base", // Framework
		"//frameworks/base/libs/hwui", // UI-rendering module
		],
		}

		java_library {
		name: "framework-graphics-stubs-systemapi",
		srcs: [":framework-graphics-stubs-srcs-systemapi"],
		sdk_version: "system_current",
		visibility: [
		"//frameworks/base", // Framework
		"//frameworks/base/libs/hwui", // UI-rendering module
		],
		}

		// ------------------------
		// APEX
		// ------------------------

graphics/java/android/graphics/ColorMatrix.java→libs/hwui/apex/java/android/graphics/ColorMatrix.java

+0 −0

File moved.

View file

libs/hwui/api/current.txt

0 → 100644

+23 −0

Original line number	Diff line number	Diff line
		// Signature format: 2.0
		package android.graphics {

		public class ColorMatrix {
		ctor public ColorMatrix();
		ctor public ColorMatrix(float[]);
		ctor public ColorMatrix(android.graphics.ColorMatrix);
		method public final float[] getArray();
		method public void postConcat(android.graphics.ColorMatrix);
		method public void preConcat(android.graphics.ColorMatrix);
		method public void reset();
		method public void set(android.graphics.ColorMatrix);
		method public void set(float[]);
		method public void setConcat(android.graphics.ColorMatrix, android.graphics.ColorMatrix);
		method public void setRGB2YUV();
		method public void setRotate(int, float);
		method public void setSaturation(float);
		method public void setScale(float, float, float, float);
		method public void setYUV2RGB();
		}

		}

libs/hwui/api/module-lib-current.txt

0 → 100644

+1 −0

Original line number	Diff line number	Diff line
		// Signature format: 2.0