From 60bc203660224ffd7244a17d13e7a6f90b5cd0d0 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Fri, 30 Apr 2010 10:13:33 -0700 Subject: [PATCH] Adapt to new location of libcore Change-Id: I17a2f432f69bd0cb381e83b6395fb2ae6e4faf9d --- core/cleanspec.mk | 128 +--------------------------------------------- core/main.mk | 2 +- 2 files changed, 2 insertions(+), 128 deletions(-) diff --git a/core/cleanspec.mk b/core/cleanspec.mk index d3fc9a43e..c85c4504b 100644 --- a/core/cleanspec.mk +++ b/core/cleanspec.mk @@ -22,7 +22,7 @@ # IDEALLY, THOSE STEPS SHOULD BE DONE ATOMICALLY. # ********************************************************************** # -INTERNAL_CLEAN_BUILD_VERSION := 3 +INTERNAL_CLEAN_BUILD_VERSION := 4 # # *********************************************************************** # Do not touch INTERNAL_CLEAN_BUILD_VERSION if you've added a clean step! @@ -58,132 +58,6 @@ INTERNAL_CLEAN_BUILD_VERSION := 3 #$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates) #$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f) #$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*) -$(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/SHARED_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/com.google.android.datamessaging_intermediates) -$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/sholes/obj/SHARED_LIBRARIES/libhardware_legacy_intermediates) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/pvasflocal.cfg) -$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/sholes) -$(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 $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio/ringtones/Silence.ogg) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio/ringtones/notifications/Silence.ogg) -$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/passion/obj/SHARED_LIBRARIES/libhardware_legacy_intermediates) -$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/com.google.android.datamessaging_intermediates) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libcrypto_intermediates) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libssl_intermediates) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/EXECUTABLES/openssl_intermediates) -$(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/STATIC_LIBRARIES/libwebcore_intermediates) -$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/bugreport) -$(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/SHARED_LIBRARIES/libdvm_intermediates) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libandroid_runtime_intermediates) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libwebcore_intermediates) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libwebcore_intermediates) -$(call add-clean-step, rm -rf $(OUT_DIR)/obj/target/common/obj/APPS/VoiceSearch_intermediates) -$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/VoiceSearch_intermediates) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libgps-rpc_intermediates) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/pdsm_atl_intermediates) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libgps_intermediates) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libhardware_legacy_intermediates) -$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/*/system/app/Launcher.apk) -$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/bluetooth/) -$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/sholes/system/build.prop) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/com.amazon.mp3_intermediates) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/com.amazon.mp3.apk) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app) -$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/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/STATIC_LIBRARIES/libwebcore_intermediates) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app) -$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) -$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/EXECUTABLES/openssl_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/libv8_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/libjs_intermediates) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libv8_intermediates) -$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/com/android/internal/os/IDropBoxService.java) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app) -$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/GoogleSubscribedFeedsProvider.apk) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app) -$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS) -$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libhardware_legacy_intermediates) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app) -$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libmediaplayerservice_intermediates) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libstagefright_intermediates) -$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/GoogleServicesFramework_intermediates) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/VoiceSearchWithKeyboard.apk) -$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Email_intermediates) -$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Email_intermediates) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/vendor/google_voiceime) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/QuickSearchBox.apk) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libdvm_intermediates) -$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/speech) -$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Email_intermediates) -$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/EnhancedGoogleSearchProvider.apk) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*) -$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/GoogleCheckin.apk) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libdvm*) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libgtest_main_intermediates) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libgtest_intermediates) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/Music*) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Music*) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/Music*) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Music*) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Launcher.apk) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/AlarmClock.apk) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Calendar.apk) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/DeskClock.apk) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Email.apk) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Facebook.apk) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Gallery3D.apk) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Maps.apk) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/MyFaves.apk) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/googlevoice.apk) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/kickback.apk) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/soundback.apk) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/talkback.apk) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/Launcher*) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Launcher*.apk) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/Music*) -$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Music*) -$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/jsr305_intermediates) -$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/guava_intermediates) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/*) -$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/*) -$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST diff --git a/core/main.mk b/core/main.mk index 0e53a98a8..dc81bbd03 100644 --- a/core/main.mk +++ b/core/main.mk @@ -400,7 +400,7 @@ ifneq (,$(shell which javac 2>/dev/null)) subdirs += \ build/tools/signapk \ dalvik/dx \ - dalvik/libcore \ + libcore \ sdk/archquery \ sdk/androidprefs \ sdk/apkbuilder \