commit 67e3373948a94b360febb62a068e128703e30450
author Juan Silveira <jjso@google.com> Tue Oct 20 01:30:41 2015 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 20 01:30:41 2015 +0000
tree d773639dfaaf0127283b4494f54a74d44a1e324a
parent 59fcb9ce402c1bb5c9e833fec8c63e37047ab8da
parent abe2da3ed1118861d5997c61d05018290f2a7e61

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 07130d400c am: b6973a57c3 am: a379acb1cb am: 28c9e80cc0
am: abe2da3ed1

* commit 'abe2da3ed1118861d5997c61d05018290f2a7e61':

Android.mk

diff --git a/Android.mk b/Android.mk
index 110117b..41130af 100644
--- a/Android.mk
+++ b/Android.mk
@@ -47,7 +47,6 @@
 
 include $(BUILD_PACKAGE)
 
-include $(call all-makefiles-under,$(LOCAL_PATH))
 
 #
 # Protocol Buffer Debug Utility in Java
@@ -64,7 +63,6 @@
 LOCAL_MODULE := launcher_protoutil_lib
 LOCAL_IS_HOST_MODULE := true
 LOCAL_JAR_MANIFEST := util/etc/manifest.txt
-LOCAL_STATIC_JAVA_LIBRARIES := host-libprotobuf-java-2.3.0-nano
 
 include $(BUILD_HOST_JAVA_LIBRARY)
 
@@ -79,10 +77,10 @@
 
 include $(BUILD_SYSTEM)/base_rules.mk
 
-$(LOCAL_BUILT_MODULE): launcher_protoutil_lib
+$(LOCAL_BUILT_MODULE): | $(HOST_OUT_JAVA_LIBRARIES)/launcher_protoutil_lib.jar
 $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/util/etc/launcher_protoutil | $(ACP)
 	@echo "Copy: $(PRIVATE_MODULE) ($@)"
 	$(copy-file-to-new-target)
 	$(hide) chmod 755 $@
 
-INTERNAL_DALVIK_MODULES += $(LOCAL_INSTALLED_MODULE)
+include $(call all-makefiles-under,$(LOCAL_PATH))