diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-22 23:26:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-22 23:26:47 +0000 |
| commit | a3717bb79efc81f3a9536626234ef76a95adb1ce (patch) | |
| tree | a03c3c689aaf0423ae4148d1b1c12cf83b7aec96 | |
| parent | 13945ed038662b7afd267b9d77e235985fc8c219 (diff) | |
| parent | 6a715592b94ca069cd34be461b3cb49b575ed381 (diff) | |
| download | platform_tools_loganalysis-a3717bb79efc81f3a9536626234ef76a95adb1ce.tar.gz platform_tools_loganalysis-a3717bb79efc81f3a9536626234ef76a95adb1ce.tar.bz2 platform_tools_loganalysis-a3717bb79efc81f3a9536626234ef76a95adb1ce.zip | |
Merge "Convert loganalysis-tests to Android.bp" am: 0964fcf1c1 am: 9a7966b7b6 am: 6a715592b9
Change-Id: I195c585c90b14d6b6a5af0e5288aed4966819bee
| -rw-r--r-- | tests/Android.bp | 28 | ||||
| -rw-r--r-- | tests/Android.mk | 23 |
2 files changed, 31 insertions, 20 deletions
diff --git a/tests/Android.bp b/tests/Android.bp new file mode 100644 index 0000000..623b4ab --- /dev/null +++ b/tests/Android.bp @@ -0,0 +1,28 @@ +// 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-tests", + defaults: ["tradefed_defaults"], + + // Only compile source java files in this lib. + srcs: ["src/**/*.java"], + + libs: [ + "loganalysis", + "json-prebuilt", + "junit-host", + "easymock", + ], +} diff --git a/tests/Android.mk b/tests/Android.mk index 8eda916..e3958cd 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -14,29 +14,12 @@ 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-tests -LOCAL_MODULE_TAGS := optional -LOCAL_JAVA_LIBRARIES := loganalysis json-prebuilt junit-host easymock - -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-tests.jar +$(DEST_JAR): $(call intermediates-dir-for,JAVA_LIBRARIES,loganalysis-tests,HOST)/javalib.jar $(copy-file-to-new-target) # this dependency ensure the above rule will be executed if module is built -$(LOCAL_INSTALLED_MODULE) : $(DEST_JAR) - -# Build all sub-directories -include $(call all-makefiles-under,$(LOCAL_PATH)) +$(HOST_OUT_JAVA_LIBRARIES)/loganalysis-tests.jar : $(DEST_JAR) |