diff options
| author | 2018-05-12 22:11:27 +0900 | |
|---|---|---|
| committer | 2018-05-15 11:38:44 +0900 | |
| commit | 1c671fd7dd72b8438b100600f0568d7cf344f5a8 (patch) | |
| tree | dcb1209d44e2aaf5eac83747d8f9b471adce0e05 | |
| parent | 198b9f4f6a9136a0a0bc3e0dfdf56d8ef6e33af0 (diff) | |
Convert apicheck tool build to Soong.
Bug: b/78034256
Test: m clean && m checkapi
Change-Id: Iaced7335714138730349bbea8a993705f197ae77
| -rw-r--r-- | core/config.mk | 3 | ||||
| -rw-r--r-- | tools/apicheck/Android.bp | 22 | ||||
| -rw-r--r-- | tools/apicheck/Android.mk | 27 |
3 files changed, 23 insertions, 29 deletions
diff --git a/core/config.mk b/core/config.mk index 506ce1a7d4..6a497ab76d 100644 --- a/core/config.mk +++ b/core/config.mk @@ -753,8 +753,7 @@ MD5SUM:=md5sum endif APICHECK_CLASSPATH_ENTRIES := \ - $(HOST_OUT_JAVA_LIBRARIES)/doclava$(COMMON_JAVA_PACKAGE_SUFFIX) \ - $(HOST_OUT_JAVA_LIBRARIES)/jsilver$(COMMON_JAVA_PACKAGE_SUFFIX) \ + $(HOST_OUT_JAVA_LIBRARIES)/apicheck$(COMMON_JAVA_PACKAGE_SUFFIX) \ $(HOST_JDK_TOOLS_JAR) \ ) APICHECK_CLASSPATH := $(subst $(space),:,$(strip $(APICHECK_CLASSPATH_ENTRIES))) diff --git a/tools/apicheck/Android.bp b/tools/apicheck/Android.bp new file mode 100644 index 0000000000..8fe20e91f8 --- /dev/null +++ b/tools/apicheck/Android.bp @@ -0,0 +1,22 @@ +// Copyright (C) 2008 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_binary_host { + name: "apicheck", + wrapper: "etc/apicheck", + static_libs: [ + "doclava", + "jsilver", + ], +} diff --git a/tools/apicheck/Android.mk b/tools/apicheck/Android.mk deleted file mode 100644 index ab3493d9c0..0000000000 --- a/tools/apicheck/Android.mk +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright (C) 2007-2008 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) - -# the hat script -# ============================================================ -include $(CLEAR_VARS) -LOCAL_IS_HOST_MODULE := true -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_MODULE := apicheck -LOCAL_SRC_FILES := etc/apicheck -LOCAL_REQUIRED_MODULES := doclava -include $(BUILD_PREBUILT) - -# Apicheck is now part of Doclava -- See external/doclava. |