Finish moving the policies out of frameworks/policies/base and into frameworks/base.
Change-Id: Id3a0c06202b0f6f2206acf490c8655d340ee0556
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 707404b..6455103 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -51,6 +51,8 @@
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/app)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/content)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/FrameworkTest_intermediates/)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/android.policy*)
+$(call add-clean-step, rm -rf $(TARGET_OUT_JAVA_LIBRARIES)/android.policy.jar)
# ************************************************
diff --git a/policy/Android.mk b/policy/Android.mk
index 0e9d86d..a887142 100644
--- a/policy/Android.mk
+++ b/policy/Android.mk
@@ -7,7 +7,6 @@
LOCAL_SRC_FILES := \
$(call all-subdir-java-files)
-LOCAL_MODULE := android.policy_phone
-LOCAL_UNINSTALLABLE_MODULE := true
+LOCAL_MODULE := android.policy
-#include $(BUILD_JAVA_LIBRARY)
+include $(BUILD_JAVA_LIBRARY)
diff --git a/tests/framework-tests/src/Android.mk b/tests/framework-tests/src/Android.mk
index 54e33a4..f537b52 100644
--- a/tests/framework-tests/src/Android.mk
+++ b/tests/framework-tests/src/Android.mk
@@ -5,6 +5,6 @@
LOCAL_MODULE := framework-tests
-LOCAL_JAVA_LIBRARIES := android.policy_phone android.test.runner
+LOCAL_JAVA_LIBRARIES := android.policy android.test.runner
include $(BUILD_JAVA_LIBRARY)
