Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove custom copy rules, stop using ACP"

Browse Source
This commit is contained in:
Dan Willemsen
2016-03-23 21:47:00 +00:00
committed by Gerrit Code Review
parent 4a0497c8e4 98ff0b72f0
commit 72dd79fa41
9 changed files with 49 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Android.mk
View File

@@ -934,10 +934,8 @@ LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $(BUILD_DROIDDOC) include $(BUILD_DROIDDOC)
static_doc_index_redirect := $(out_dir)/index.html static_doc_index_redirect := $(out_dir)/index.html
$(static_doc_index_redirect): \ $(static_doc_index_redirect): $(LOCAL_PATH)/docs/docs-documentation-redirect.html
$(LOCAL_PATH)/docs/docs-documentation-redirect.html | $(ACP) $(copy-file-to-target)
$(hide) mkdir -p $(dir $@)
$(hide) $(ACP) $< $@
$(full_target): $(static_doc_index_redirect) $(full_target): $(static_doc_index_redirect)
$(full_target): $(framework_built) $(full_target): $(framework_built)

15
cmds/bmgr/Android.mk
View File

@@ -1,15 +1,16 @@
# Copyright 2007 The Android Open Source Project # Copyright 2007 The Android Open Source Project
# #
LOCAL_PATH:= $(call my-dir) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_MODULE := bmgr LOCAL_MODULE := bmgrlib
LOCAL_MODULE_STEM := bmgr
include $(BUILD_JAVA_LIBRARY) include $(BUILD_JAVA_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
ALL_PREBUILT += $(TARGET_OUT)/bin/bmgr LOCAL_MODULE := bmgr
$(TARGET_OUT)/bin/bmgr : $(LOCAL_PATH)/bmgr | $(ACP) LOCAL_MODULE_CLASS := EXECUTABLES
$(transform-prebuilt-to-target) LOCAL_SRC_FILES := bmgr
LOCAL_REQUIRED_MODULES := bmgrlib
include $(BUILD_PREBUILT)

15
cmds/ime/Android.mk
View File

@@ -1,15 +1,16 @@
# Copyright 2007 The Android Open Source Project # Copyright 2007 The Android Open Source Project
# #
LOCAL_PATH:= $(call my-dir) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_MODULE := ime LOCAL_MODULE := imelib
LOCAL_MODULE_STEM := ime
include $(BUILD_JAVA_LIBRARY) include $(BUILD_JAVA_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
ALL_PREBUILT += $(TARGET_OUT)/bin/ime LOCAL_MODULE := ime
$(TARGET_OUT)/bin/ime : $(LOCAL_PATH)/ime | $(ACP) LOCAL_MODULE_CLASS := EXECUTABLES
$(transform-prebuilt-to-target) LOCAL_SRC_FILES := ime
LOCAL_REQUIRED_MODULES := imelib
include $(BUILD_PREBUILT)

13
cmds/input/Android.mk
View File

@@ -1,13 +1,16 @@
# Copyright 2008 The Android Open Source Project # Copyright 2008 The Android Open Source Project
# #
LOCAL_PATH:= $(call my-dir) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_MODULE := input LOCAL_MODULE := inputlib
LOCAL_MODULE_STEM := input
include $(BUILD_JAVA_LIBRARY) include $(BUILD_JAVA_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
ALL_PREBUILT += $(TARGET_OUT)/bin/input LOCAL_MODULE := input
$(TARGET_OUT)/bin/input : $(LOCAL_PATH)/input | $(ACP) LOCAL_MODULE_CLASS := EXECUTABLES
$(transform-prebuilt-to-target) LOCAL_SRC_FILES := input
LOCAL_REQUIRED_MODULES := inputlib
include $(BUILD_PREBUILT)

15
cmds/pm/Android.mk
View File

@@ -1,15 +1,16 @@
# Copyright 2007 The Android Open Source Project # Copyright 2007 The Android Open Source Project
# #
LOCAL_PATH:= $(call my-dir) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_MODULE := pm LOCAL_MODULE := pmlib
LOCAL_MODULE_STEM := pm
include $(BUILD_JAVA_LIBRARY) include $(BUILD_JAVA_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
ALL_PREBUILT += $(TARGET_OUT)/bin/pm LOCAL_MODULE := pm
$(TARGET_OUT)/bin/pm : $(LOCAL_PATH)/pm | $(ACP) LOCAL_MODULE_CLASS := EXECUTABLES
$(transform-prebuilt-to-target) LOCAL_SRC_FILES := pm
LOCAL_REQUIRED_MODULES := pmlib
include $(BUILD_PREBUILT)

15
cmds/svc/Android.mk
View File

@@ -1,15 +1,16 @@
# Copyright 2007 The Android Open Source Project # Copyright 2007 The Android Open Source Project
# #
LOCAL_PATH:= $(call my-dir) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_MODULE := svc LOCAL_MODULE := svclib
LOCAL_MODULE_STEM := svc
include $(BUILD_JAVA_LIBRARY) include $(BUILD_JAVA_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
ALL_PREBUILT += $(TARGET_OUT)/bin/svc LOCAL_MODULE := svc
$(TARGET_OUT)/bin/svc : $(LOCAL_PATH)/svc | $(ACP) LOCAL_MODULE_CLASS := EXECUTABLES
$(transform-prebuilt-to-target) LOCAL_SRC_FILES := svc
LOCAL_REQUIRED_MODULES := svclib
include $(BUILD_PREBUILT)

6
cmds/uiautomator/library/Android.mk
View File

@@ -116,11 +116,11 @@ $(eval $(call check-api, \
.PHONY: update-uiautomator-api .PHONY: update-uiautomator-api
update-uiautomator-api: PRIVATE_API_DIR := $(uiautomator_api_dir) update-uiautomator-api: PRIVATE_API_DIR := $(uiautomator_api_dir)
update-uiautomator-api: PRIVATE_REMOVED_API_FILE := $(uiautomator_internal_removed_api_file) update-uiautomator-api: PRIVATE_REMOVED_API_FILE := $(uiautomator_internal_removed_api_file)
update-uiautomator-api: $(uiautomator_internal_api_file) | $(ACP) update-uiautomator-api: $(uiautomator_internal_api_file)
@echo Copying uiautomator current.txt @echo Copying uiautomator current.txt
$(hide) $(ACP) $< $(PRIVATE_API_DIR)/current.txt $(hide) cp $< $(PRIVATE_API_DIR)/current.txt
@echo Copying uiautomator removed.txt @echo Copying uiautomator removed.txt
$(hide) $(ACP) $(PRIVATE_REMOVED_API_FILE) $(PRIVATE_API_DIR)/removed.txt $(hide) cp $(PRIVATE_REMOVED_API_FILE) $(PRIVATE_API_DIR)/removed.txt
############################################### ###############################################
# clean up temp vars # clean up temp vars
uiautomator.core_src_files := uiautomator.core_src_files :=

2
core/tests/coretests/Android.mk
View File

@@ -38,7 +38,7 @@ include $(BUILD_PACKAGE)
FrameworkCoreTests_all_apks_res := $(addprefix $(FrameworkCoreTests_intermediates)/raw/, \ FrameworkCoreTests_all_apks_res := $(addprefix $(FrameworkCoreTests_intermediates)/raw/, \
$(foreach a, $(FrameworkCoreTests_all_apks), $(patsubst FrameworkCoreTests_%,%,$(a)))) $(foreach a, $(FrameworkCoreTests_all_apks), $(patsubst FrameworkCoreTests_%,%,$(a))))
$(FrameworkCoreTests_all_apks_res): $(FrameworkCoreTests_intermediates)/raw/%: $(call intermediates-dir-for,APPS,FrameworkCoreTests_%)/package.apk | $(ACP) $(FrameworkCoreTests_all_apks_res): $(FrameworkCoreTests_intermediates)/raw/%: $(call intermediates-dir-for,APPS,FrameworkCoreTests_%)/package.apk
$(call copy-file-to-new-target) $(call copy-file-to-new-target)
# Use R_file_stamp as dependency because we want the test apks in place before the R.java is generated. # Use R_file_stamp as dependency because we want the test apks in place before the R.java is generated.

10
tools/preload2/Android.mk
View File

@@ -3,7 +3,6 @@ LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-java-files-under,src) LOCAL_SRC_FILES := $(call all-java-files-under,src)
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
# To connect to devices (and take hprof dumps). # To connect to devices (and take hprof dumps).
LOCAL_STATIC_JAVA_LIBRARIES := ddmlib-prebuilt LOCAL_STATIC_JAVA_LIBRARIES := ddmlib-prebuilt
@@ -22,11 +21,8 @@ include $(BUILD_HOST_JAVA_LIBRARY)
# Copy the preload-tool shell script to the host's bin directory. # Copy the preload-tool shell script to the host's bin directory.
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_IS_HOST_MODULE := true LOCAL_IS_HOST_MODULE := true
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_MODULE_CLASS := EXECUTABLES
LOCAL_MODULE := preload-tool LOCAL_MODULE := preload-tool
include $(BUILD_SYSTEM)/base_rules.mk LOCAL_SRC_FILES := preload-tool
$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/preload-tool $(ACP) LOCAL_REQUIRED_MODULES := preload2
@echo "Copy: $(PRIVATE_MODULE) ($@)" include $(BUILD_PREBUILT)
$(copy-file-to-new-target)
$(hide) chmod 755 $@