Merge "Convert apicheck tool build to Soong." am: 5e2056b906

am: 90525df267

Change-Id: Ia8242a167369f545c24f76911d315cf7e2b30d4c
This commit is contained in:
Jiyong Park 2018-05-15 00:05:58 -07:00 committed by android-build-merger
commit 6cb36a5d6c
3 changed files with 23 additions and 29 deletions

View File

@ -759,8 +759,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)))

22
tools/apicheck/Android.bp Normal file
View File

@ -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",
],
}

View File

@ -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.