Remove custom copy rules, stop using ACP
Replace some custom rules with BUILD_PREBUILT.
Move tools from ALL_PREBUILTS to BUILD_PREBUILT. All of them are already
in PRODUCT_PACKAGES in build/target/product/base.mk.
Remove uses of ACP and replace with core build system macros or 'cp'
Change-Id: I529e7c6c50fc64ad36b75bb47142f6bde909d141
diff --git a/cmds/bmgr/Android.mk b/cmds/bmgr/Android.mk
index 8a1670b..d520cf2 100644
--- a/cmds/bmgr/Android.mk
+++ b/cmds/bmgr/Android.mk
@@ -1,15 +1,16 @@
# Copyright 2007 The Android Open Source Project
#
LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
+include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_MODULE := bmgr
+LOCAL_MODULE := bmgrlib
+LOCAL_MODULE_STEM := bmgr
include $(BUILD_JAVA_LIBRARY)
-
include $(CLEAR_VARS)
-ALL_PREBUILT += $(TARGET_OUT)/bin/bmgr
-$(TARGET_OUT)/bin/bmgr : $(LOCAL_PATH)/bmgr | $(ACP)
- $(transform-prebuilt-to-target)
-
+LOCAL_MODULE := bmgr
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_SRC_FILES := bmgr
+LOCAL_REQUIRED_MODULES := bmgrlib
+include $(BUILD_PREBUILT)
diff --git a/cmds/ime/Android.mk b/cmds/ime/Android.mk
index 90b1c91..6803fc0 100644
--- a/cmds/ime/Android.mk
+++ b/cmds/ime/Android.mk
@@ -1,15 +1,16 @@
# Copyright 2007 The Android Open Source Project
#
LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
+include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_MODULE := ime
+LOCAL_MODULE := imelib
+LOCAL_MODULE_STEM := ime
include $(BUILD_JAVA_LIBRARY)
-
include $(CLEAR_VARS)
-ALL_PREBUILT += $(TARGET_OUT)/bin/ime
-$(TARGET_OUT)/bin/ime : $(LOCAL_PATH)/ime | $(ACP)
- $(transform-prebuilt-to-target)
-
+LOCAL_MODULE := ime
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_SRC_FILES := ime
+LOCAL_REQUIRED_MODULES := imelib
+include $(BUILD_PREBUILT)
diff --git a/cmds/input/Android.mk b/cmds/input/Android.mk
index 3d56533..4e983e3 100644
--- a/cmds/input/Android.mk
+++ b/cmds/input/Android.mk
@@ -1,13 +1,16 @@
# Copyright 2008 The Android Open Source Project
#
LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
+include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_MODULE := input
+LOCAL_MODULE := inputlib
+LOCAL_MODULE_STEM := input
include $(BUILD_JAVA_LIBRARY)
include $(CLEAR_VARS)
-ALL_PREBUILT += $(TARGET_OUT)/bin/input
-$(TARGET_OUT)/bin/input : $(LOCAL_PATH)/input | $(ACP)
- $(transform-prebuilt-to-target)
+LOCAL_MODULE := input
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_SRC_FILES := input
+LOCAL_REQUIRED_MODULES := inputlib
+include $(BUILD_PREBUILT)
diff --git a/cmds/pm/Android.mk b/cmds/pm/Android.mk
index 7911d62..6a03def 100644
--- a/cmds/pm/Android.mk
+++ b/cmds/pm/Android.mk
@@ -1,15 +1,16 @@
# Copyright 2007 The Android Open Source Project
#
LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
+include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_MODULE := pm
+LOCAL_MODULE := pmlib
+LOCAL_MODULE_STEM := pm
include $(BUILD_JAVA_LIBRARY)
-
include $(CLEAR_VARS)
-ALL_PREBUILT += $(TARGET_OUT)/bin/pm
-$(TARGET_OUT)/bin/pm : $(LOCAL_PATH)/pm | $(ACP)
- $(transform-prebuilt-to-target)
-
+LOCAL_MODULE := pm
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_SRC_FILES := pm
+LOCAL_REQUIRED_MODULES := pmlib
+include $(BUILD_PREBUILT)
diff --git a/cmds/svc/Android.mk b/cmds/svc/Android.mk
index 198efb2..a4824c7 100644
--- a/cmds/svc/Android.mk
+++ b/cmds/svc/Android.mk
@@ -1,15 +1,16 @@
# Copyright 2007 The Android Open Source Project
#
LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
+include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_MODULE := svc
+LOCAL_MODULE := svclib
+LOCAL_MODULE_STEM := svc
include $(BUILD_JAVA_LIBRARY)
-
include $(CLEAR_VARS)
-ALL_PREBUILT += $(TARGET_OUT)/bin/svc
-$(TARGET_OUT)/bin/svc : $(LOCAL_PATH)/svc | $(ACP)
- $(transform-prebuilt-to-target)
-
+LOCAL_MODULE := svc
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_SRC_FILES := svc
+LOCAL_REQUIRED_MODULES := svclib
+include $(BUILD_PREBUILT)
diff --git a/cmds/uiautomator/library/Android.mk b/cmds/uiautomator/library/Android.mk
index 2123f25..64ff87c 100644
--- a/cmds/uiautomator/library/Android.mk
+++ b/cmds/uiautomator/library/Android.mk
@@ -116,11 +116,11 @@
.PHONY: update-uiautomator-api
update-uiautomator-api: PRIVATE_API_DIR := $(uiautomator_api_dir)
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
- $(hide) $(ACP) $< $(PRIVATE_API_DIR)/current.txt
+ $(hide) cp $< $(PRIVATE_API_DIR)/current.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
uiautomator.core_src_files :=