Merge "Move QuickSearchBox to /product"
diff --git a/Android.bp b/Android.bp
index 118340b..c06dc3a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -26,6 +26,7 @@
         "src/**/*.logtags",
     ],
     certificate: "shared",
+    product_specific: true,
     resource_dirs: ["res"],
     optimize: {
         proguard_flags_files: ["proguard.flags"],
diff --git a/CleanSpec.mk b/CleanSpec.mk
index b84e1b6..99199e0 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -43,6 +43,7 @@
 #$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
 #$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
 #$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/QuickSearchBox)
 
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST