diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-05-17 01:27:58 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-05-17 01:27:58 +0000 |
commit | 7c4aeb12ee1330313a1574e013afbdcb2b81f0f6 (patch) | |
tree | ae03bddf6b566e034077cc16ac8936b934a2b006 | |
parent | 9308120bc2e837170793af30388b6a21d5e47c07 (diff) | |
parent | 978dc23b99a0927103ae38cd105c974abc3f24c2 (diff) | |
download | loganalysis-7c4aeb12ee1330313a1574e013afbdcb2b81f0f6.tar.gz |
Merge "Loganalysis: convert to soong (1/2)"android-p-preview-5android-p-preview-4android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1
-rw-r--r-- | Android.bp | 26 | ||||
-rw-r--r-- | Android.mk | 21 |
2 files changed, 30 insertions, 17 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..7860d07 --- /dev/null +++ b/Android.bp @@ -0,0 +1,26 @@ +// Copyright (C) 2013 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_host { + name: "loganalysis", + defaults: [ "tradefed_defaults" ], + + srcs: [ "src/**/*.java" ], + + static_libs: [ + "guava-18.0-prebuilt", + "json-prebuilt", + "junit", + ], +} @@ -14,29 +14,16 @@ LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -# Only compile source java files in this lib. -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_JAVACFLAGS += -g -Xlint --include tools/tradefederation/core/error_prone_rules.mk - -LOCAL_MODULE := loganalysis -LOCAL_MODULE_TAGS := optional -LOCAL_STATIC_JAVA_LIBRARIES := guava-18.0-prebuilt json-prebuilt junit-host - -include $(BUILD_HOST_JAVA_LIBRARY) - # makefile rules to copy jars to HOST_OUT/tradefed # so tradefed.sh can automatically add to classpath -DEST_JAR := $(HOST_OUT)/tradefed/$(LOCAL_MODULE).jar -$(DEST_JAR): $(LOCAL_BUILT_MODULE) +DEST_JAR := $(HOST_OUT)/tradefed/loganalysis.jar +BUILT_JAR := $(call intermediates-dir-for,JAVA_LIBRARIES,loganalysis,HOST)/javalib.jar +$(DEST_JAR): $(BUILT_JAR) $(copy-file-to-new-target) # this dependency ensure the above rule will be executed if module is built -$(LOCAL_INSTALLED_MODULE) : $(DEST_JAR) +$(HOST_OUT_JAVA_LIBRARIES)/loganalysis.jar : $(DEST_JAR) # Build all sub-directories include $(call all-makefiles-under,$(LOCAL_PATH)) |