summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2019-03-01 16:06:57 +0000
committerPaul Duffin <paulduffin@google.com>2019-03-01 16:06:57 +0000
commitc9bdf0c21dcdb0eeea11fc2e9fc4b5e5d5f6561a (patch)
tree0ec53109c74e049f01e2949e8002797c1fee450c /tools
parentb4b11e1fe58388b3cc0cf876efc3730a6cdbd8a6 (diff)
Convert tools/upstream to Android.bp
Test: make checkbuild Change-Id: Ie495d6ce870a60460b36130dbc271e0cd045c940
Diffstat (limited to 'tools')
-rw-r--r--tools/upstream/Android.bp31
-rw-r--r--tools/upstream/Android.mk34
2 files changed, 31 insertions, 34 deletions
diff --git a/tools/upstream/Android.bp b/tools/upstream/Android.bp
new file mode 100644
index 0000000000..dd01c30caa
--- /dev/null
+++ b/tools/upstream/Android.bp
@@ -0,0 +1,31 @@
+//
+// 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: "libcore-compare-upstreams",
+ srcs: ["src/main/java/**/*.java"],
+ manifest: "src/main/libcore-compare-upstreams.mf",
+}
+
+//#############################################################
+
+java_library_host {
+ name: "libcore-copy-upstream-files",
+ srcs: ["src/main/java/**/*.java"],
+ manifest: "src/main/libcore-copy-upstream-files.mf",
+}
diff --git a/tools/upstream/Android.mk b/tools/upstream/Android.mk
deleted file mode 100644
index bc56f5dd99..0000000000
--- a/tools/upstream/Android.mk
+++ /dev/null
@@ -1,34 +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 := libcore-compare-upstreams
-LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java)
-LOCAL_JAR_MANIFEST := src/main/libcore-compare-upstreams.mf
-include $(BUILD_HOST_JAVA_LIBRARY)
-
-##############################################################
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libcore-copy-upstream-files
-LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java)
-LOCAL_JAR_MANIFEST := src/main/libcore-copy-upstream-files.mf
-include $(BUILD_HOST_JAVA_LIBRARY)