diff options
| author | Jiyong Park <jiyong@google.com> | 2018-03-12 06:41:28 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-03-12 06:41:28 +0000 |
| commit | 554659d3217fc12ec4b7a7a62efebd4d8ffb484c (patch) | |
| tree | ca13f16b22500be40bd4e28a3d27d779416b2d5f | |
| parent | 166c78939dfb8ba09174c1d7741e0607c9d85bdb (diff) | |
| parent | d74977f22849e989bbf99a93e042a486791697c7 (diff) | |
| download | apache-xml-554659d3217fc12ec4b7a7a62efebd4d8ffb484c.tar.gz | |
Merge "Convert Android.mk to Android.bp" am: a64fe320ae am: bbdd15392b
am: d74977f228
Change-Id: Ib387d490cf938ec2b37eb49a710ef5729dc47efc
| -rw-r--r-- | Android.bp | 26 | ||||
| -rw-r--r-- | Android.mk | 39 |
2 files changed, 26 insertions, 39 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..756a6a6 --- /dev/null +++ b/Android.bp @@ -0,0 +1,26 @@ +// +// 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 { + name: "apache-xml", + hostdex: true, + no_framework_libs: true, + srcs: ["src/main/java/**/*.java"], + include_srcs: true, + errorprone: { + javacflags: ["-Xep:MissingOverride:OFF"], + }, +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 266943f..0000000 --- a/Android.mk +++ /dev/null @@ -1,39 +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) - -apache-xml_src_files := $(call all-java-files-under,src/main/java) - -include $(CLEAR_VARS) -LOCAL_MODULE := apache-xml -LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := $(apache-xml_src_files) -LOCAL_JAVA_LIBRARIES := core-oj core-libart -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_RESOURCE_DIRS := src/main/java -LOCAL_ERROR_PRONE_FLAGS := -Xep:MissingOverride:OFF -include $(BUILD_JAVA_LIBRARY) - -ifeq ($(HOST_OS),linux) -include $(CLEAR_VARS) -LOCAL_MODULE := apache-xml-hostdex -LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := $(apache-xml_src_files) -LOCAL_MODULE_TAGS := optional -LOCAL_JAVA_RESOURCE_DIRS := src/main/java -LOCAL_ERROR_PRONE_FLAGS := -Xep:MissingOverride:OFF -include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) -endif # HOST_OS == linux |