Replace custom rules, remove ACP
A few LOCAL_ADDITIONAL_DEPENDENCIES were required, where LOCAL_REQUIRED_MODULES would be nicer, but you can't require a module of the same name. It would create a dependency loop with the current require implementation, so it's filtered by the build system. Also translate monkey from ALL_PREBUILTS to a prebuilt like the rest of the tools. This doesn't change anything, since 'monkey' is already in build/target/product/base.mk. ACP is being removed, so use the standard build system macros to copy files. Change-Id: I4f73c6b35c0d7ae25467145b0a9d5c32ba4578d2
This commit is contained in:
@@ -14,24 +14,15 @@
|
||||
|
||||
LOCAL_PATH := $(call my-dir)
|
||||
|
||||
# We use copy-file-to-new-target so that the installed
|
||||
# script file's timestamp is at least as new as the
|
||||
# .jar file it wraps.
|
||||
|
||||
# the execution script
|
||||
# ============================================================
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_IS_HOST_MODULE := true
|
||||
LOCAL_MODULE_CLASS := EXECUTABLES
|
||||
LOCAL_MODULE := rmtypedefs
|
||||
|
||||
include $(BUILD_SYSTEM)/base_rules.mk
|
||||
|
||||
$(LOCAL_BUILT_MODULE): $(HOST_OUT_JAVA_LIBRARIES)/rmtypedefs$(COMMON_JAVA_PACKAGE_SUFFIX)
|
||||
$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/etc/rmtypedefs | $(ACP)
|
||||
@echo "Copy: $(PRIVATE_MODULE) ($@)"
|
||||
$(copy-file-to-new-target)
|
||||
$(hide) chmod 755 $@
|
||||
LOCAL_SRC_FILES := etc/rmtypedefs
|
||||
LOCAL_ADDITIONAL_DEPENDENCIES := $(HOST_OUT_JAVA_LIBRARIES)/rmtypedefs$(COMMON_JAVA_PACKAGE_SUFFIX)
|
||||
include $(BUILD_PREBUILT)
|
||||
|
||||
# the other stuff
|
||||
# ============================================================
|
||||
|
||||
Reference in New Issue
Block a user