diff options
| author | Joe Onorato <joeo@android.com> | 2010-04-06 20:21:30 -0500 |
|---|---|---|
| committer | Joe Onorato <joeo@android.com> | 2010-04-06 20:21:30 -0500 |
| commit | a5c51373d478ea33ffddab13ca8a722c297802ef (patch) | |
| tree | 0686b4e1c43bbbf38a2c21cbf36b6b30e87395a0 | |
| parent | b1b28e26d771f5f0e10a52b8fd77c276c641e086 (diff) | |
| download | frameworks_base-a5c51373d478ea33ffddab13ca8a722c297802ef.zip frameworks_base-a5c51373d478ea33ffddab13ca8a722c297802ef.tar.gz frameworks_base-a5c51373d478ea33ffddab13ca8a722c297802ef.tar.bz2 | |
Finish moving the policies out of frameworks/policies/base and into frameworks/base.
Change-Id: Id3a0c06202b0f6f2206acf490c8655d340ee0556
| -rw-r--r-- | CleanSpec.mk | 2 | ||||
| -rw-r--r-- | policy/Android.mk | 5 | ||||
| -rw-r--r-- | tests/framework-tests/src/Android.mk | 2 |
3 files changed, 5 insertions, 4 deletions
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/framew $(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 @@ include $(CLEAR_VARS) 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_SRC_FILES := $(call all-subdir-java-files) 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) |