Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a240ce20 authored by Joe Onorato's avatar Joe Onorato Committed by Android (Google) Code Review
Browse files

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

Merge "Finish moving the policies out of frameworks/policies/base and into frameworks/base." into kraken
parents 7f41a992 a5c51373

CleanSpec.mk

+2 −0
Original line number Diff line number Diff line
@@ -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)





# ************************************************

policy/Android.mk

+2 −3
Original line number Diff line number Diff line
@@ -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)

tests/framework-tests/src/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -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)