From e867e27a3b4ef12155d7c064a6816157954d172d Mon Sep 17 00:00:00 2001
From: Antoan Angelov <arangelov@google.com>
Date: Thu, 19 Jul 2018 12:57:33 +0000
Subject: [PATCH] Revert "Move SdkSetup.apk to vendor partition"

This reverts commit 3bf31401fe89b1941132d2c9159e290dfab3b2df.

Reason for revert: Build cop revert because this change is breaking Blueline builds.

Change-Id: I54f87f21eec0e93873ffedec6b0bbe154584ba4b
---
 CleanSpec.mk             | 2 --
 apps/SdkSetup/Android.mk | 1 -
 2 files changed, 3 deletions(-)

diff --git a/CleanSpec.mk b/CleanSpec.mk
index 31f9afbddb9..a113c7152d2 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -46,8 +46,6 @@
 
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/CorpApp_intermediates)
 
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/SdkSetup)
-
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************
diff --git a/apps/SdkSetup/Android.mk b/apps/SdkSetup/Android.mk
index f2f40bb0f00..833de03aab7 100644
--- a/apps/SdkSetup/Android.mk
+++ b/apps/SdkSetup/Android.mk
@@ -3,7 +3,6 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := optional
 LOCAL_PRIVILEGED_MODULE := true
-LOCAL_VENDOR_MODULE := true
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
 LOCAL_PACKAGE_NAME := SdkSetup