diff options
| author | Colin Cross <ccross@android.com> | 2021-11-10 17:52:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-11-10 17:52:39 +0000 |
| commit | 3b874b5a04a54f17fcd68e4de1a1843c967012d0 (patch) | |
| tree | aa1dcb8238b8ae70e8aa05d71490629b27884f45 | |
| parent | 5408a7a45cd0fbf100196f1839eca6311d02dd19 (diff) | |
| parent | 9223cffca3618e1bc7019c26c5589e3902e55a8f (diff) | |
| download | loganalysis-3b874b5a04a54f17fcd68e4de1a1843c967012d0.tar.gz | |
Remove custom install rules for loganalysis am: d2183cd694 am: 64481ea979 am: 9223cffca3
Original change: https://android-review.googlesource.com/c/platform/tools/loganalysis/+/1880621
Change-Id: Ie29885f04061d1a69e7b8b179502ab08e5895521
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | Android.mk | 29 | ||||
| -rw-r--r-- | javatests/Android.mk | 25 |
3 files changed, 1 insertions, 55 deletions
@@ -16,7 +16,7 @@ package { default_applicable_licenses: ["Android-Apache-2.0"], } -java_library_host { +tradefed_java_library_host { name: "loganalysis", defaults: [ "tradefed_defaults" ], diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 8a99575..0000000 --- a/Android.mk +++ /dev/null @@ -1,29 +0,0 @@ -# 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. - -LOCAL_PATH := $(call my-dir) - -# makefile rules to copy jars to HOST_OUT/tradefed -# so tradefed.sh can automatically add to classpath - -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 -$(HOST_OUT_JAVA_LIBRARIES)/loganalysis.jar : $(DEST_JAR) - -# Build all sub-directories -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/javatests/Android.mk b/javatests/Android.mk deleted file mode 100644 index e3958cd..0000000 --- a/javatests/Android.mk +++ /dev/null @@ -1,25 +0,0 @@ -# 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. - -LOCAL_PATH := $(call my-dir) - -# makefile rules to copy jars to HOST_OUT/tradefed -# so tradefed.sh can automatically add to classpath - -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 -$(HOST_OUT_JAVA_LIBRARIES)/loganalysis-tests.jar : $(DEST_JAR) |