Merge "Clean framework-aidl-export-defaults up" (0868e078) · Commits · e / os / android_frameworks_base

Android.bp

+8 −7

Original line number	Diff line number	Diff line
		@@ -297,6 +297,8 @@ filegroup {
		],
		}

		// AIDL files under these paths are mixture of public and private ones.
		// They shouldn't be exported across module boundaries.
		java_defaults {
		name: "framework-aidl-export-defaults",
		aidl: {
		@@ -321,12 +323,6 @@ java_defaults {
		"wifi/aidl-export",
		],
		},

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

		// Collection of classes that are generated from non-Java files that are not listed in
		@@ -416,6 +412,12 @@ java_defaults {
		"view-inspector-annotation-processor",
		"staledataclass-annotation-processor",
		],

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

		filegroup {
		@@ -539,7 +541,6 @@ java_library {

		java_library {
		name: "framework-annotation-proc",
		defaults: ["framework-aidl-export-defaults"],
		srcs: [":framework-all-sources"],
		libs: [
		"app-compat-annotations",