summaryrefslogtreecommitdiff
path: root/tools/streaming_proto
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2017-09-08 22:47:47 -0700
committerDan Willemsen <dwillemsen@google.com>2017-09-09 06:18:48 +0000
commitd3eac266b02399a8a822517e844c05585879221a (patch)
tree9d6cefd142dd515c9e3ad946f6549f9727822c8e /tools/streaming_proto
parent1cb5ab2dc14fb35359525479a7c7356d84904ce1 (diff)
Convert host tools to Android.bp
See build/soong/README.md for more information. Test: m libinstrumentation interrupter accessorychat accessorytest bit obbtool pbkdf2gen libsplit-select_tests split-select protoc-gen-javastream validatekeymaps libaapt_tests aapt Test: mmma frameworks/base Test: out/host/linux-x86/nativetest64/libaapt_tests/libaapt_tests Test: out/host/linux-x86/nativetest64/libsplit-select_tests/libsplit-select_tests Change-Id: I93cf24d4b232353a52d53be8ed85781b8f4a3877
Diffstat (limited to 'tools/streaming_proto')
-rw-r--r--tools/streaming_proto/Android.bp29
-rw-r--r--tools/streaming_proto/Android.mk13
2 files changed, 29 insertions, 13 deletions
diff --git a/tools/streaming_proto/Android.bp b/tools/streaming_proto/Android.bp
new file mode 100644
index 000000000000..24068e9ffe92
--- /dev/null
+++ b/tools/streaming_proto/Android.bp
@@ -0,0 +1,29 @@
+//
+// 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.
+//
+
+// ==========================================================
+// Build the host executable: protoc-gen-javastream
+// ==========================================================
+cc_binary_host {
+ name: "protoc-gen-javastream",
+ srcs: [
+ "Errors.cpp",
+ "string_utils.cpp",
+ "main.cpp",
+ ],
+
+ shared_libs: ["libprotoc"],
+}
diff --git a/tools/streaming_proto/Android.mk b/tools/streaming_proto/Android.mk
index 5a54fd10415d..ebb77a197883 100644
--- a/tools/streaming_proto/Android.mk
+++ b/tools/streaming_proto/Android.mk
@@ -16,19 +16,6 @@
LOCAL_PATH:= $(call my-dir)
# ==========================================================
-# Build the host executable: protoc-gen-javastream
-# ==========================================================
-include $(CLEAR_VARS)
-LOCAL_MODULE := protoc-gen-javastream
-LOCAL_SRC_FILES := \
- Errors.cpp \
- string_utils.cpp \
- main.cpp
-LOCAL_SHARED_LIBRARIES := \
- libprotoc
-include $(BUILD_HOST_EXECUTABLE)
-
-# ==========================================================
# Build the java test
# ==========================================================
include $(CLEAR_VARS)