diff options
| author | Colin Cross <ccross@android.com> | 2017-10-07 01:15:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-07 01:15:54 +0000 |
| commit | 18c9a03009a7697cb865688b2745583695682b9b (patch) | |
| tree | c19f34ab94cd8829fdc4f3ea17ba546353ecaa4f | |
| parent | 200f48bdeb527423b0d0fe42dfca7af8a2764eb9 (diff) | |
| parent | 30844e7df092eef0212312a9a0fe17d2b715f1c9 (diff) | |
| download | misc-18c9a03009a7697cb865688b2745583695682b9b.tar.gz | |
Merge "Convert args4j prebuilt to Android.bp" am: 68b778db59
am: 30844e7df0
Change-Id: I1da496d70e5ecf56574199112acf3993647c3a9b
| -rw-r--r-- | common/args4j/Android.bp | 18 | ||||
| -rw-r--r-- | common/args4j/Android.mk | 22 |
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) |