diff options
| -rw-r--r-- | cleanspec.mk | 12 | ||||
| -rw-r--r-- | core/build_id.mk | 2 | ||||
| -rw-r--r-- | core/combo/darwin-x86.mk | 1 | ||||
| -rw-r--r-- | core/combo/linux-arm.mk | 2 | ||||
| -rw-r--r-- | core/combo/select.mk | 2 | ||||
| -rw-r--r-- | core/definitions.mk | 4 | ||||
| -rw-r--r-- | core/main.mk | 2 | ||||
| -rw-r--r-- | core/pathmap.mk | 6 | ||||
| -rw-r--r-- | target/product/generic_with_google.mk | 3 | ||||
| -rwxr-xr-x | tools/releasetools/sign_target_files_apks | 4 |
10 files changed, 27 insertions, 11 deletions
diff --git a/cleanspec.mk b/cleanspec.mk index 5bf4278..414fb84 100644 --- a/cleanspec.mk +++ b/cleanspec.mk @@ -97,10 +97,22 @@ $(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/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) diff --git a/core/build_id.mk b/core/build_id.mk index 4661aea..64ee0e1 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -23,7 +23,7 @@ # (like "TC1-RC5"). It must be a single word, and is # capitalized by convention. # -BUILD_ID := ECLAIR +BUILD_ID := ECLAIR-MR2 # DISPLAY_BUILD_NUMBER should only be set for development branches, # If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for diff --git a/core/combo/darwin-x86.mk b/core/combo/darwin-x86.mk index 2150960..65d6375 100644 --- a/core/combo/darwin-x86.mk +++ b/core/combo/darwin-x86.mk @@ -14,6 +14,7 @@ $(combo_target)JNILIB_SUFFIX := .jnilib $(combo_target)GLOBAL_CFLAGS += \ -include $(call select-android-config-h,darwin-x86) $(combo_target)RUN_RANLIB_AFTER_COPYING := true +$(combo_target)GLOBAL_ARFLAGS := cqs ifeq ($(combo_target),TARGET_) $(combo_target)CUSTOM_LD_COMMAND := true diff --git a/core/combo/linux-arm.mk b/core/combo/linux-arm.mk index 6011351..6529106 100644 --- a/core/combo/linux-arm.mk +++ b/core/combo/linux-arm.mk @@ -112,7 +112,7 @@ endif $(combo_target)GLOBAL_CPPFLAGS += -fvisibility-inlines-hidden $(combo_target)RELEASE_CFLAGS := \ - -DSK_RELEASE -DNDEBUG \ + -DNDEBUG \ -g \ -Wstrict-aliasing=2 \ -finline-functions \ diff --git a/core/combo/select.mk b/core/combo/select.mk index 793b0a9..ccdf1fb 100644 --- a/core/combo/select.mk +++ b/core/combo/select.mk @@ -40,7 +40,7 @@ $(combo_target)HAVE_KERNEL_MODULES := 0 $(combo_target)GLOBAL_CFLAGS := -fno-exceptions -Wno-multichar $(combo_target)RELEASE_CFLAGS := -O2 -g -fno-strict-aliasing $(combo_target)GLOBAL_LDFLAGS := -$(combo_target)GLOBAL_ARFLAGS := crs +$(combo_target)GLOBAL_ARFLAGS := crsP $(combo_target)EXECUTABLE_SUFFIX := $(combo_target)SHLIB_SUFFIX := .so diff --git a/core/definitions.mk b/core/definitions.mk index 3221525..06b6201 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -931,7 +931,7 @@ define transform-o-to-static-lib @rm -f $@ $(extract-and-include-whole-static-libs) @echo "target StaticLib: $(PRIVATE_MODULE) ($@)" -$(hide) $(TARGET_AR) $(TARGET_GLOBAL_ARFLAGS) $(PRIVATE_ARFLAGS) $@ $^ +$(hide) echo $^ | xargs $(TARGET_AR) $(TARGET_GLOBAL_ARFLAGS) $(PRIVATE_ARFLAGS) $@ endef ########################################################### @@ -944,7 +944,7 @@ define transform-host-o-to-static-lib @mkdir -p $(dir $@) @echo "host StaticLib: $(PRIVATE_MODULE) ($@)" @rm -f $@ -$(HOST_AR) $(HOST_GLOBAL_ARFLAGS) $(PRIVATE_ARFLAGS) $@ $^ +echo $^ | xargs $(HOST_AR) $(HOST_GLOBAL_ARFLAGS) $(PRIVATE_ARFLAGS) $@ endef diff --git a/core/main.mk b/core/main.mk index f618194..0fce663 100644 --- a/core/main.mk +++ b/core/main.mk @@ -392,7 +392,6 @@ subdirs += \ development/apps \ development/tools/mkstubs \ frameworks/base/tools/layoutlib \ - external/googleclient \ packages else $(warning sdk-only: javac not available.) @@ -736,4 +735,3 @@ modules: .PHONY: showcommands showcommands: @echo >/dev/null - diff --git a/core/pathmap.mk b/core/pathmap.mk index 1ae663d..bc2fcb4 100644 --- a/core/pathmap.mk +++ b/core/pathmap.mk @@ -72,6 +72,11 @@ JNI_H_INCLUDE := $(call include-path-for,libnativehelper)/nativehelper # A list of all source roots under frameworks/base, which will be # built into the android.jar. # +# Note - "common" is included here, even though it is also built +# into a static library (android-common) for unbundled use. This +# is so common and the other framework libraries can have mutual +# interdependencies. +# FRAMEWORKS_BASE_SUBDIRS := \ $(addsuffix /java, \ core \ @@ -84,6 +89,7 @@ FRAMEWORKS_BASE_SUBDIRS := \ wifi \ vpn \ keystore \ + common \ ) # diff --git a/target/product/generic_with_google.mk b/target/product/generic_with_google.mk index ba30f15..e69303d 100644 --- a/target/product/generic_with_google.mk +++ b/target/product/generic_with_google.mk @@ -13,8 +13,7 @@ PRODUCT_PACKAGES := \ PRODUCT_COPY_FILES := \ vendor/google/frameworks/maps/com.google.android.maps.xml:system/etc/permissions/com.google.android.maps.xml \ - vendor/google/frameworks/datamessaging/com.google.android.datamessaging.xml:system/etc/permissions/com.google.android.datamessaging.xml \ - vendor/google/apps/GTalkService/com.google.android.gtalkservice.xml:system/etc/permissions/com.google.android.gtalkservice.xml + vendor/google/frameworks/datamessaging/com.google.android.datamessaging.xml:system/etc/permissions/com.google.android.datamessaging.xml $(call inherit-product, $(SRC_TARGET_DIR)/product/generic.mk) diff --git a/tools/releasetools/sign_target_files_apks b/tools/releasetools/sign_target_files_apks index 961e643..9d296d8 100755 --- a/tools/releasetools/sign_target_files_apks +++ b/tools/releasetools/sign_target_files_apks @@ -55,7 +55,7 @@ Usage: sign_target_files_apks [flags] input_target_files output_target_files the last component of the build fingerprint). Prefix each with '+' or '-' to indicate whether that tag should be added or removed. Changes are processed in the order they appear. - Default value is "-test-keys,+ota-rel-keys,+release-keys". + Default value is "-test-keys,+release-keys". """ @@ -80,7 +80,7 @@ OPTIONS = common.OPTIONS OPTIONS.extra_apks = {} OPTIONS.key_map = {} OPTIONS.replace_ota_keys = False -OPTIONS.tag_changes = ("-test-keys", "+ota-rel-keys", "+release-keys") +OPTIONS.tag_changes = ("-test-keys", "+release-keys") def GetApkCerts(tf_zip): certmap = {} |