3 files changed, 18 insertions, 65 deletions
diff --git a/cmds/am/Android.mk b/cmds/am/Android.mk
index 8b321b323615..f8350dce7f50 100644
--- a/cmds/am/Android.mk
+++ b/cmds/am/Android.mk
@@ -1,31 +1,15 @@
 # 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 := am
 include $(BUILD_JAVA_LIBRARY)
 
 include $(CLEAR_VARS)
-ALL_PREBUILT += $(TARGET_OUT)/bin/am
-$(TARGET_OUT)/bin/am : $(LOCAL_PATH)/am | $(ACP)
-	$(transform-prebuilt-to-target)
-
-NOTICE_FILE := NOTICE
-files_noticed := bin/am
-
-# Generate rules for a single file. The argument is the file path relative to
-# the installation root
-define make-notice-file
-
-$(TARGET_OUT_NOTICE_FILES)/src/$(1).txt: $(LOCAL_PATH)/$(NOTICE_FILE)
-	@echo Notice file: $$< -- $$@
-	@mkdir -p $$(dir $$@)
-	@cat $$< >> $$@
-
-$(TARGET_OUT_NOTICE_FILES)/hash-timestamp: $(TARGET_OUT_NOTICE_FILES)/src/$(1).txt
-
-endef
-
-$(foreach file,$(files_noticed),$(eval $(call make-notice-file,$(file))))
+LOCAL_MODULE := am
+LOCAL_SRC_FILES := am
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_MODULE_TAGS := optional
+include $(BUILD_PREBUILT)
diff --git a/cmds/content/Android.mk b/cmds/content/Android.mk
index 88c46f2792d5..9302e2fc54db 100644
--- a/cmds/content/Android.mk
+++ b/cmds/content/Android.mk
@@ -1,33 +1,15 @@
 # Copyright 2012 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 := content
-
 include $(BUILD_JAVA_LIBRARY)
 
 include $(CLEAR_VARS)
-ALL_PREBUILT += $(TARGET_OUT)/bin/content
-$(TARGET_OUT)/bin/content : $(LOCAL_PATH)/content | $(ACP)
-	$(transform-prebuilt-to-target)
-
-NOTICE_FILE := NOTICE
-files_noticed := bin/content
-
-# Generate rules for a single file. The argument is the file path relative to
-# the installation root
-define make-notice-file
-
-$(TARGET_OUT_NOTICE_FILES)/src/$(1).txt: $(LOCAL_PATH)/$(NOTICE_FILE)
-	@echo Notice file: $$< -- $$@
-	@mkdir -p $$(dir $$@)
-	@cat $$< >> $$@
-
-$(TARGET_OUT_NOTICE_FILES)/hash-timestamp: $(TARGET_OUT_NOTICE_FILES)/src/$(1).txt
-
-endef
-
-$(foreach file,$(files_noticed),$(eval $(call make-notice-file,$(file))))
+LOCAL_MODULE := content
+LOCAL_SRC_FILES := content
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_MODULE_TAGS := optional
+include $(BUILD_PREBUILT)
diff --git a/cmds/wm/Android.mk b/cmds/wm/Android.mk
index a255cae4214f..3f3795fc4460 100644
--- a/cmds/wm/Android.mk
+++ b/cmds/wm/Android.mk
@@ -1,28 +1,15 @@
 # Copyright 2013 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 := wm
 include $(BUILD_JAVA_LIBRARY)
 
 include $(CLEAR_VARS)
-
-NOTICE_FILE := NOTICE
-files_noticed := bin/wm
-
-# Generate rules for a single file. The argument is the file path relative to
-# the installation root
-define make-notice-file
-
-$(TARGET_OUT_NOTICE_FILES)/src/$(1).txt: $(LOCAL_PATH)/$(NOTICE_FILE)
-	@echo Notice file: $$< -- $$@
-	@mkdir -p $$(dir $$@)
-	@cat $$< >> $$@
-
-$(TARGET_OUT_NOTICE_FILES)/hash-timestamp: $(TARGET_OUT_NOTICE_FILES)/src/$(1).txt
-
-endef
-
-$(foreach file,$(files_noticed),$(eval $(call make-notice-file,$(file))))
+LOCAL_MODULE := wm
+LOCAL_SRC_FILES := wm
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_MODULE_TAGS := optional
+include $(BUILD_PREBUILT)