summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2017-10-07 01:19:12 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-10-07 01:19:12 +0000
commitc6d82e9ac2281f6e59d599ce17593a868a035bde (patch)
treeccc7ecae483193106162e32d54724a1a7a259bfb
parentaab32cfd3250f9a558b52092c8619a0dabc0fd2c (diff)
parent18c9a03009a7697cb865688b2745583695682b9b (diff)
downloadmisc-c6d82e9ac2281f6e59d599ce17593a868a035bde.tar.gz
Merge "Convert args4j prebuilt to Android.bp" am: 68b778db59 am: 30844e7df0
am: 18c9a03009 Change-Id: I8c2e9f0d5363baa5aed77c014f1598c5143451f0
-rw-r--r--common/args4j/Android.bp18
-rw-r--r--common/args4j/Android.mk22
2 files changed, 18 insertions, 22 deletions
diff --git a/common/args4j/Android.bp b/common/args4j/Android.bp
new file mode 100644
index 00000000..867b6ea8
--- /dev/null
+++ b/common/args4j/Android.bp
@@ -0,0 +1,18 @@
+// 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_import_host {
+ name: "args4j-2.0.28",
+ jars: ["args4j-2.0.28.jar"],
+}
diff --git a/common/args4j/Android.mk b/common/args4j/Android.mk
deleted file mode 100644
index c81bef7f..00000000
--- a/common/args4j/Android.mk
+++ /dev/null
@@ -1,22 +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_PREBUILT_STATIC_JAVA_LIBRARIES := \
- args4j-2.0.28:args4j-2.0.28.jar\
-
-include $(BUILD_HOST_PREBUILT)