Merge commit 'remotes/goog/eclair' into eclair-release

This commit is contained in:
The Android Open Source Project
2009-08-24 10:39:52 -07:00
2 changed files with 1 additions and 1 deletions

View File

@@ -75,6 +75,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/EXECUTABLES/openssl_intermediat
$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/sholes/system/build.prop) $(call add-clean-step, rm -rf $(OUT_DIR)/target/product/sholes/system/build.prop)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libwebcore_intermediates) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libwebcore_intermediates)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libwebcore_intermediates) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libwebcore_intermediates)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates)
# ************************************************ # ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

View File

@@ -76,7 +76,6 @@ FRAMEWORKS_BASE_SUBDIRS := \
$(addsuffix /java, \ $(addsuffix /java, \
core \ core \
graphics \ graphics \
im \
location \ location \
media \ media \
opengl \ opengl \