diff options
| author | Colin Cross <ccross@android.com> | 2018-08-17 09:07:10 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-08-17 09:07:10 -0700 |
| commit | 68de7031a8bb372d6dea3a2f40e782e8c157186c (patch) | |
| tree | aa769361d7671db2dc27e4a6af7b2fea2d3f42f7 | |
| parent | ceab0583d395decc4a3a3d8c3c0106b2c2b4ea83 (diff) | |
| parent | 295af277ed13340fc4b716ef3c906fa3066163c8 (diff) | |
| download | archive-patcher-68de7031a8bb372d6dea3a2f40e782e8c157186c.tar.gz | |
Convert external/archive-patcher to Android.bp
am: 295af277ed
Change-Id: I6f4968b13ac7e0746092abe724d7647782285334
| -rw-r--r-- | Android.bp | 27 | ||||
| -rw-r--r-- | Android.mk | 35 |
2 files changed, 27 insertions, 35 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..3fbb48b --- /dev/null +++ b/Android.bp @@ -0,0 +1,27 @@ +// +// Copyright (C) 2016 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 { + name: "archive-patcher", + hostdex: true, + srcs: [ + "shared/src/main/java/**/*.java", + "applier/src/main/java/**/*.java", + ], + // archive-patcher should be compatible with all versions of Android + sdk_version: "4", + java_version: "1.6", +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 6704350..0000000 --- a/Android.mk +++ /dev/null @@ -1,35 +0,0 @@ -# -# Copyright (C) 2016 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) - -archive-patcher_shared_src_files := $(call all-java-files-under,shared/src/main/java) -archive-patcher_applier_src_files := $(call all-java-files-under,applier/src/main/java) - -include $(CLEAR_VARS) -LOCAL_MODULE := archive-patcher -LOCAL_SRC_FILES := $(archive-patcher_shared_src_files) $(archive-patcher_applier_src_files) -# archive-patcher should be compatible with all versions of Android -LOCAL_SDK_VERSION := 4 -LOCAL_JAVA_LANGUAGE_VERSION := 1.6 -include $(BUILD_STATIC_JAVA_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(archive-patcher_shared_src_files) $(archive-patcher_applier_src_files) -LOCAL_MODULE := archive-patcher-hostdex -# archive-patcher should be compatible with all versions of Android -LOCAL_SDK_VERSION := 4 -LOCAL_JAVA_LANGUAGE_VERSION := 1.6 -include $(BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY) |