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

Commit 4b0f7dd2 authored by Ying Wang's avatar Ying Wang Committed by Brian Carlstrom
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.

(cherry picked from commit 3d74c663)

Change-Id: I27d967a57d6a9373da50821af32191614a3c8bc7
parent 123d99f0

Android.mk

+2 −3
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
@@ -78,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))