diff options
| author | Andreas Gampe <agampe@google.com> | 2018-05-17 10:49:26 -0700 |
|---|---|---|
| committer | Nan Zhang <nanzhang@google.com> | 2018-07-25 17:35:35 -0700 |
| commit | 37b0763a7019304ddb31f4f34a5ff50d13220469 (patch) | |
| tree | 29a78ba4ebdcc50f037231be0779deb129a87fd9 | |
| parent | 6722abdede258f834fa4bb56ff17141fb9ba7a9b (diff) | |
Frameworks: convert platformprotos to soong
(cherry picked from commit af27bf6662efb8bb9fb7943b0fdbac530b0cbc99)
Bug: 64328974
Test: m
Merged-In: I3729a3132c1ef07dded69801373edf51006fa623
Change-Id: I3729a3132c1ef07dded69801373edf51006fa623
| -rw-r--r-- | Android.bp | 18 | ||||
| -rw-r--r-- | Android.mk | 17 |
2 files changed, 18 insertions, 17 deletions
diff --git a/Android.bp b/Android.bp index 1c177b1a2363..56161792dba4 100644 --- a/Android.bp +++ b/Android.bp @@ -771,6 +771,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", diff --git a/Android.mk b/Android.mk index 46c1201bf4f8..7890983e8a24 100644 --- a/Android.mk +++ b/Android.mk @@ -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 |