aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2017-10-05 23:23:51 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-10-05 23:23:51 +0000
commit9f28727462992384161c6f7adedb9f26867a07cf (patch)
treecbf4610ea998a596dc5c008a50041135c4b11467
parent074e77c2e19e542e72e056095ff8f43441be1528 (diff)
parentf9191d2205f06beea2fc075ab1962f77d30264a8 (diff)
downloadturbine-9f28727462992384161c6f7adedb9f26867a07cf.tar.gz
Convert turbine to Android.bp am: 3c093fb3ff am: 98b82cc095 am: 91184a9f29
am: f9191d2205 Change-Id: Ifec8bc7ace7b8b6974e598b57172ca9b9512b1bb
-rw-r--r--Android.bp38
-rw-r--r--Android.mk39
2 files changed, 38 insertions, 39 deletions
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..92ca2e4
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,38 @@
+//
+// Copyright (C) 2017 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.
+//
+
+java_library_host {
+ name: "turbine",
+
+ srcs: [
+ "java/**/*.java",
+ "proto/**/*.proto",
+ ],
+
+ manifest: "manifest.txt",
+ static_libs: [
+ "asm-5.2",
+ "asm-commons-5.2",
+ "asm-tree-5.2",
+ "error_prone_annotations-2.0.18",
+ "guava-21.0",
+ "jsr305-3.0.1",
+ ],
+
+ proto: {
+ type: "full",
+ },
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 10034bb..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright (C) 2017 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)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := turbine
-LOCAL_SRC_FILES := \
- $(call all-java-files-under, java) \
- $(call all-proto-files-under, proto)
-
-LOCAL_JAR_MANIFEST := manifest.txt
-LOCAL_STATIC_JAVA_LIBRARIES := \
- asm-5.2 \
- asm-commons-5.2 \
- asm-tree-5.2 \
- error_prone_annotations-2.0.18 \
- guava-21.0 \
- jsr305-3.0.1 \
-
-LOCAL_IS_HOST_MODULE := true
-
-LOCAL_PROTOC_OPTIMIZE_TYPE := full
-LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/proto/
-
-include $(BUILD_HOST_JAVA_LIBRARY)