diff options
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Android.mk b/Android.mk index dec667e9b71c..9d5fd4560018 100644 --- a/Android.mk +++ b/Android.mk @@ -490,7 +490,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := framework-protos LOCAL_MODULE := framework -LOCAL_DX_FLAGS := --core-library --multi-dex LOCAL_JACK_FLAGS := --multi-dex native LOCAL_RMTYPEDEFS := true @@ -1063,10 +1062,8 @@ LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk include $(BUILD_DROIDDOC) static_doc_index_redirect := $(out_dir)/index.html -$(static_doc_index_redirect): \ - $(LOCAL_PATH)/docs/docs-preview-index.html | $(ACP) - $(hide) mkdir -p $(dir $@) - $(hide) $(ACP) $< $@ +$(static_doc_index_redirect): $(LOCAL_PATH)/docs/docs-preview-index.html + $(copy-file-to-target) $(full_target): $(static_doc_index_redirect) $(full_target): $(framework_built) @@ -1241,8 +1238,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := libphonenumber-platform LOCAL_MODULE_TAGS := optional LOCAL_MODULE := ext -LOCAL_DX_FLAGS := --core-library - ifneq ($(INCREMENTAL_BUILDS),) LOCAL_PROGUARD_ENABLED := disabled LOCAL_JACK_ENABLED := incremental |