Merge QPR1.180718.001

Change-Id: I87dba84af40e2f98951eeba18deb88c065ec52a2

Android.bp

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

Android.mk

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