Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Finish moving the policies out of frameworks/policies/base and into frameworks/base." into kraken

Browse Source
This commit is contained in:
Joe Onorato
2010-04-06 18:26:39 -07:00
committed by Android (Google) Code Review
parent 7f41a9922a a5c51373d4
commit a240ce208c
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CleanSpec.mk
View File

@@ -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)
# ************************************************

5
policy/Android.mk
View File

@@ -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)

2
tests/framework-tests/src/Android.mk
View File

@@ -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)