diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2016-03-23 19:12:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-03-23 19:12:36 +0000 |
| commit | 58925207ee0e8fc4a4ebd37743678362188908c1 (patch) | |
| tree | fa259f182a80b96c361befaef45389bcced4f98e | |
| parent | 0b28b42c0f2d94777b517c7f270956240978e4dd (diff) | |
| parent | 830e8eb40013d2a5c06699415b94cbc27a52bfe2 (diff) | |
| download | Launcher3-android-wear-n-preview-1.tar.gz | |
Merge "Replace custom rules with BUILD_PREBUILT"android-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-preview-2android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2
| -rw-r--r-- | Android.mk | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/Android.mk b/Android.mk index 3a6442aee5..9483738d1b 100644 --- a/Android.mk +++ b/Android.mk @@ -77,16 +77,10 @@ include $(BUILD_HOST_JAVA_LIBRARY) include $(CLEAR_VARS) LOCAL_IS_HOST_MODULE := true LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_MODULE_TAGS := optional LOCAL_MODULE := launcher_protoutil - -include $(BUILD_SYSTEM)/base_rules.mk - -$(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 $@ +LOCAL_SRC_FILES := util/etc/launcher_protoutil +LOCAL_REQUIRED_MODULES := launcher_protoutil_lib +include $(BUILD_PREBUILT) INTERNAL_DALVIK_MODULES += $(LOCAL_INSTALLED_MODULE) |