diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-07-30 20:30:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-07-30 20:30:35 +0000 |
| commit | 6928e50c267e3a3ab6633ad207bb71e57e02efb8 (patch) | |
| tree | 491f08acc0c6beb25be48b974c5d5cbdde0cb390 /Android.mk | |
| parent | 8b894a7d50b58f3d2eaf41f104ca02d50d27a04c (diff) | |
| parent | 37b0763a7019304ddb31f4f34a5ff50d13220469 (diff) | |
Merge "Frameworks: convert platformprotos to soong" into stage-aosp-master
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/Android.mk b/Android.mk index 741d2b61dc55..d7be0551d85a 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 |