Merge "Frameworks: convert platformprotos to soong" into stage-aosp-master (6928e50c) · Commits · e / os / android_frameworks_base

Android.bp

+18 −0

Original line number	Diff line number	Diff line
		@@ -773,6 +773,24 @@ java_library {
		dxflags: ["--core-library"],
		}

		// ==== java proto host library ==============================
		java_library_host {
		name: "platformprotos",
		srcs: [
		"cmds/am/proto/instrumentation_data.proto",
		"core/proto/*/.proto",
		"libs/incident/proto/*/.proto",
		"cmds/statsd/src/*/.proto",
		],
		proto: {
		include_dirs: ["external/protobuf/src"],
		type: "full",
		},
		errorprone: {
		javacflags: ["-Xep:MissingOverride:OFF"], // b/72714520
		},
		}

		// ==== c++ proto device library ==============================
		cc_library {
		name: "libplatformprotos",

+0 −17

Original line number	Diff line number	Diff line
		@@ -670,23 +670,6 @@ LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk

		include $(BUILD_DROIDDOC)

		# ==== java proto host library ==============================
		include $(CLEAR_VARS)
		LOCAL_MODULE := platformprotos
		LOCAL_PROTOC_OPTIMIZE_TYPE := full
		LOCAL_PROTOC_FLAGS := \
		-Iexternal/protobuf/src
		LOCAL_SOURCE_FILES_ALL_GENERATED := true
		LOCAL_SRC_FILES := \
		cmds/am/proto/instrumentation_data.proto \
		cmds/statsd/src/perfetto/perfetto_config.proto \
		$(call all-proto-files-under, core/proto) \
		$(call all-proto-files-under, libs/incident/proto) \
		$(call all-proto-files-under, cmds/statsd/src)
		# b/72714520
		LOCAL_ERROR_PRONE_FLAGS := -Xep:MissingOverride:OFF
		include $(BUILD_HOST_JAVA_LIBRARY)

		# ==== java proto device library (for test only) ==============================
		include $(CLEAR_VARS)
		LOCAL_MODULE := platformprotosnano