Merge "Fix "ndk-build clean" to not delete prebuilt static libraries"
diff --git a/build/core/build-binary.mk b/build/core/build-binary.mk
index 1195150..379c323 100644
--- a/build/core/build-binary.mk
+++ b/build/core/build-binary.mk
@@ -42,9 +42,12 @@
$(cleantarget): PRIVATE_MODULE := $(LOCAL_MODULE)
$(cleantarget): PRIVATE_TEXT := [$(TARGET_ARCH_ABI)]
+ifneq ($(LOCAL_BUILT_MODULE_NOT_COPIED),true)
$(cleantarget): PRIVATE_CLEAN_FILES := $(LOCAL_BUILT_MODULE) \
$($(my)OBJS)
-
+else
+$(cleantarget): PRIVATE_CLEAN_FILES := ($(my)OBJS)
+endif
$(cleantarget)::
@$(HOST_ECHO) "Clean: $(PRIVATE_MODULE) $(PRIVATE_TEXT)"
$(hide) $(call host-rmdir,$(PRIVATE_CLEAN_FILES))
diff --git a/build/core/prebuilt-static-library.mk b/build/core/prebuilt-static-library.mk
index 85ba3ce..26087c3 100644
--- a/build/core/prebuilt-static-library.mk
+++ b/build/core/prebuilt-static-library.mk
@@ -28,5 +28,6 @@
# to facilitate debugging, so use the prebuilt version directly
# at link time.
LOCAL_BUILT_MODULE := $(call local-prebuilt-path,$(LOCAL_SRC_FILES))
+LOCAL_BUILT_MODULE_NOT_COPIED := true
include $(BUILD_SYSTEM)/prebuilt-library.mk
