diff options
| author | Colin Cross <ccross@android.com> | 2019-03-28 22:31:35 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-03-29 16:35:06 -0700 |
| commit | 45c0d71e774c84ec81392393a0fafad398d2838d (patch) | |
| tree | 40b86b0262b7c58c72a2be670380e56bf7fce96d /tools/streaming_proto | |
| parent | 4ae4e50deffeddcfbaa7dcd85816c60e18011c3d (diff) | |
Convert frameworks/base/cmds/* to Android.bp
See build/soong/README.md for more information.
Also converts the rest of frameworks/base/tools/streaming_proto.
Bug: 122332340
Test: m checkbuild
Change-Id: I87c500c5464fb1722b4b518d89065f5e1ee29a97
Merged-In: Ieb54feb3902bddfd5a571369fbf50161ae646647
Diffstat (limited to 'tools/streaming_proto')
| -rw-r--r-- | tools/streaming_proto/Android.bp | 15 | ||||
| -rw-r--r-- | tools/streaming_proto/Android.mk | 28 |
2 files changed, 15 insertions, 28 deletions
diff --git a/tools/streaming_proto/Android.bp b/tools/streaming_proto/Android.bp index 1121eadca967..14eead853f50 100644 --- a/tools/streaming_proto/Android.bp +++ b/tools/streaming_proto/Android.bp @@ -49,3 +49,18 @@ cc_binary_host { defaults: ["protoc-gen-stream-defaults"], } + +// ========================================================== +// Build the java test +// ========================================================== +java_library { + name: "StreamingProtoTest", + srcs: [ + "test/**/*.java", + "test/**/*.proto", + ], + proto: { + plugin: "javastream", + }, + static_libs: ["libprotobuf-java-lite"], +} diff --git a/tools/streaming_proto/Android.mk b/tools/streaming_proto/Android.mk deleted file mode 100644 index ebb77a197883..000000000000 --- a/tools/streaming_proto/Android.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# Copyright (C) 2015 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -LOCAL_PATH:= $(call my-dir) - -# ========================================================== -# Build the java test -# ========================================================== -include $(CLEAR_VARS) -LOCAL_SRC_FILES := \ - $(call all-java-files-under, test) \ - $(call all-proto-files-under, test) -LOCAL_MODULE := StreamingProtoTest -LOCAL_PROTOC_OPTIMIZE_TYPE := stream -include $(BUILD_JAVA_LIBRARY) - |