diff options
| author | Philip P. Moltmann <moltmann@google.com> | 2018-08-17 17:12:52 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-08-17 17:12:52 -0700 |
| commit | f64b1eefa8f39b9916d18946fd4465077a5a16ec (patch) | |
| tree | 517af56f9b3df74e404c4feae0e43ff0bb7e4177 | |
| parent | 7851dce6f4ca17f5caa1c93a4e0a45686b1d56c3 (diff) | |
| parent | 0d8c0629a078aa04be6f857508026a83904d3a7c (diff) | |
| download | lzma-f64b1eefa8f39b9916d18946fd4465077a5a16ec.tar.gz | |
Merge "Soongify xz-java" am: 07e502f09f
am: 0d8c0629a0
Change-Id: I450ae5d506db822b67b6e9e45380e79a193f5e03
| -rw-r--r-- | Java/Tukaani/Android.bp | 23 | ||||
| -rw-r--r-- | Java/Tukaani/Android.mk | 30 |
2 files changed, 23 insertions, 30 deletions
diff --git a/Java/Tukaani/Android.bp b/Java/Tukaani/Android.bp new file mode 100644 index 0000000..2ce803b --- /dev/null +++ b/Java/Tukaani/Android.bp @@ -0,0 +1,23 @@ +// +// Copyright (C) 2011 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_static { + name: "xz-java", + + srcs: ["src/**/*.java"], + java_resource_dirs: ["src"], + + sdk_version: "current", +} diff --git a/Java/Tukaani/Android.mk b/Java/Tukaani/Android.mk deleted file mode 100644 index 240882e..0000000 --- a/Java/Tukaani/Android.mk +++ /dev/null @@ -1,30 +0,0 @@ -# -# Copyright (C) 2011 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_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_SDK_VERSION = current - -LOCAL_MODULE := xz-java - -LOCAL_MODULE_TAGS := optional - -LOCAL_JAVA_RESOURCE_DIRS := src -include $(BUILD_STATIC_JAVA_LIBRARY) - |