Revert "Remove custom installation rules"

This reverts commit ca4418ffaca48d2e85d330a3cd203e4df162f083.

Bug: 141877526
Bug: 143063995
Change-Id: I61f9de4e8bf7751e9c9e6728ffac48ac9f8c5538

2 files changed, 12 insertions, 1 deletions

diff --git a/Android.bp b/Android.bp
index bac19f5..f7055c4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-tradefed_java_library_host {
+java_library_host {
   name: "loganalysis",
   defaults: [ "tradefed_defaults" ],
 
diff --git a/Android.mk b/Android.mk
index 4568567..8a99575 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,5 +14,16 @@
 
 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))