Merge "Convert libplatfomprotos to Android.bp" (21d9aeb7) · Commits · e / os / android_frameworks_base

Android.bp

+38 −0

Original line number	Original line	Diff line number	Diff line
	@@ -12,6 +12,44 @@
	// See the License for the specific language governing permissions and		// See the License for the specific language governing permissions and
	// limitations under the License.		// limitations under the License.

			// ==== c++ proto device library ==============================
			cc_library {
			name: "libplatformprotos",
			host_supported: true,
			// b/34740546, work around clang-tidy segmentation fault.
			tidy_checks: ["-modernize*"],
			proto: {
			export_proto_headers: true,
			include_dirs: ["external/protobuf/src"],
			},

			target: {
			host: {
			proto: {
			type: "full",
			},
			},
			android: {
			proto: {
			type: "lite",
			},
			shared: {
			// The proto files generate full protos, but we only use
			// them as lite on device. This works fine for a static
			// library, where the unused full symbols are stripped,
			// but fails if it is linked as a standalone shared
			// library because it is missing the full runtime.
			enabled: false,
			},
			},
			},

			srcs: [
			"core/proto/*/.proto",
			"libs/incident/*/.proto",
			],
			}

	subdirs = [		subdirs = [
	"libs/*",		"libs/*",
	"tools/*",		"tools/*",

+0 −29

Original line number	Original line	Diff line number	Diff line
	@@ -1478,35 +1478,6 @@ endif

	include $(BUILD_JAVA_LIBRARY)		include $(BUILD_JAVA_LIBRARY)

	# ==== c++ proto device library ==============================
	include $(CLEAR_VARS)
	LOCAL_MODULE := libplatformprotos
	# b/34740546, work around clang-tidy segmentation fault.
	LOCAL_TIDY_CHECKS := -modernize*
	LOCAL_PROTOC_OPTIMIZE_TYPE := lite
	LOCAL_PROTOC_FLAGS := \
	--include_source_info \
	-Iexternal/protobuf/src
	LOCAL_SRC_FILES := \
	$(call all-proto-files-under, core/proto) \
	$(call all-proto-files-under, libs/incident/proto)
	include $(BUILD_STATIC_LIBRARY)

	# ==== c++ proto host library ==============================
	include $(CLEAR_VARS)
	LOCAL_MODULE := libplatformprotos
	# b/34740546, work around clang-tidy segmentation fault.
	LOCAL_TIDY_CHECKS := -modernize*
	LOCAL_PROTOC_OPTIMIZE_TYPE := full
	LOCAL_PROTOC_FLAGS := \
	--include_source_info \
	-Iexternal/protobuf/src
	LOCAL_SRC_FILES := \
	$(call all-proto-files-under, core/proto) \
	$(call all-proto-files-under, libs/incident/proto)
	include $(BUILD_HOST_SHARED_LIBRARY)


	# ==== java proto host library ==============================		# ==== java proto host library ==============================
	include $(CLEAR_VARS)		include $(CLEAR_VARS)
	LOCAL_MODULE := platformprotos		LOCAL_MODULE := platformprotos