Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d74c663 authored by Ying Wang's avatar Ying Wang
Browse files

Fix Android.mk. 

- You don't need to explicitly specify protobuf library; The library
  name has been changed and the build system automatically adds it.
- You can't have a file target $(LOCAL_BUILT_MODULE) depend on phony target
  launcher_protoutil_lib.
- "include $(call all-makefiles-under,$(LOCAL_PATH))" must be on the
  last line.

Change-Id: I0d7d7df555f53b5ee5ff2bc5fe2b9e58dbe8a9d5
parent a2306fce

Android.mk

+2 −4
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ LOCAL_PROGUARD_FLAG_FILES := proguard.flags 


include $(BUILD_PACKAGE)



include $(call all-makefiles-under,$(LOCAL_PATH))



#

# Protocol Buffer Debug Utility in Java
@@ -64,7 +63,6 @@ LOCAL_MODULE_TAGS := optional 
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 @@ LOCAL_MODULE := launcher_protoutil 


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