Move the platform protos to the tradefed-proto target
Test: None
Bug: None
Change-Id: I28f59b5ac6b54725ad1400925c0a20541f7bcea0
diff --git a/Android.mk b/Android.mk
index a56a13e..b62bfc5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,6 +24,13 @@
LOCAL_SOURCE_FILES_ALL_GENERATED := true
LOCAL_MODULE_TAGS := optional
+# If the real one isn't present, use the prebuilt platformprotos library.
+ifeq ($(wildcard frameworks/base/Android.mk),)
+ LOCAL_STATIC_JAVA_LIBRARIES += platformprotos-prebuilt
+else
+ LOCAL_STATIC_JAVA_LIBRARIES += platformprotos
+endif
+
include $(BUILD_HOST_JAVA_LIBRARY)
include $(CLEAR_VARS)
@@ -44,13 +51,6 @@
LOCAL_STATIC_JAVA_LIBRARIES := junit-host kxml2-2.3.0 jline-1.0 tf-remote-client commons-compress-prebuilt host-libprotobuf-java-full tradefed-protos error_prone_annotations-2.0.18 longevity-host-lib
-# If the real one isn't present, use the prebuilt platformprotos library.
-ifeq ($(wildcard frameworks/base/Android.mk),)
- LOCAL_STATIC_JAVA_LIBRARIES += platformprotos-prebuilt
-else
- LOCAL_STATIC_JAVA_LIBRARIES += platformprotos
-endif
-
# emmalib is only a runtime dependency if generating code coverage reporters,
# not a compile time dependency
LOCAL_JAVA_LIBRARIES := emmalib jack-jacoco-reporter loganalysis tools-common-prebuilt