diff options
author | Colin Cross <ccross@android.com> | 2017-10-03 12:33:02 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-10-03 12:33:02 +0000 |
commit | 747304f28d750fbdcdaf5fbf56f235e6f6efa16a (patch) | |
tree | 705e1d7068904dad35b3f9e806e11a7be9c5ae40 | |
parent | 2daeabfd25ab55a232f04b09fbb484bc48e8efe4 (diff) | |
parent | fb49c60a72bb6d0df0d0c16a8d431c93514ae496 (diff) | |
download | platform_external_jarjar-747304f28d750fbdcdaf5fbf56f235e6f6efa16a.tar.gz platform_external_jarjar-747304f28d750fbdcdaf5fbf56f235e6f6efa16a.tar.bz2 platform_external_jarjar-747304f28d750fbdcdaf5fbf56f235e6f6efa16a.zip |
Convert jarjar to Android.bp am: 2acaac5c90 am: 9ccadaf655android-wear-8.0.0_r1
am: fb49c60a72
Change-Id: Ib9ca07ec393486946951860cde9f04a1b9e93310
-rw-r--r-- | Android.bp | 43 | ||||
-rw-r--r-- | Android.mk | 50 |
2 files changed, 43 insertions, 50 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..7136444 --- /dev/null +++ b/Android.bp @@ -0,0 +1,43 @@ +// Copyright (C) 2014 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: "jarjar", + manifest: "manifest.txt", + + srcs: ["src/main/**/*.java"], + java_resource_dirs: ["res"], + + static_libs: [ + "asm-5.2", + "asm-commons-5.2", + ], + + libs: [ + "jarjar-maven-plugin-api", + "jarjar-apache-ant", + ], +} + +//################################################# + +java_import_host { + name: "jarjar-maven-plugin-api", + jars: ["lib/maven-plugin-api.jar"], +} + +java_import_host { + name: "jarjar-apache-ant", + jars: ["lib/apache-ant-1.9.4.jar"], +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 7b3427b..0000000 --- a/Android.mk +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright (C) 2014 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) - -ifeq ($(wildcard prebuilts/misc/common/jarjar),) - -LOCAL_SRC_FILES := $(call all-java-files-under, src/main) - -LOCAL_STATIC_JAVA_LIBRARIES := \ - asm-5.2 \ - asm-commons-5.2 \ - -LOCAL_JAVA_LIBRARIES := \ - jarjar-maven-plugin-api \ - jarjar-apache-ant - -LOCAL_MODULE := jarjar -LOCAL_MODULE_TAGS := optional -LOCAL_JAR_MANIFEST := manifest.txt -LOCAL_JAVA_RESOURCE_DIRS := res - -include $(BUILD_HOST_JAVA_LIBRARY) - -################################################## -include $(CLEAR_VARS) - -LOCAL_PREBUILT_JAVA_LIBRARIES := \ - jarjar-asm:lib/asm-4.0$(COMMON_JAVA_PACKAGE_SUFFIX) \ - jarjar-asm-commons:lib/asm-commons-4.0$(COMMON_JAVA_PACKAGE_SUFFIX) \ - jarjar-maven-plugin-api:lib/maven-plugin-api$(COMMON_JAVA_PACKAGE_SUFFIX) \ - jarjar-apache-ant:lib/apache-ant-1.9.4$(COMMON_JAVA_PACKAGE_SUFFIX) - -LOCAL_MODULE_TAGS := optional - -include $(BUILD_HOST_PREBUILT) - -endif |