diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/build_id.mk | 16 | ||||
| -rw-r--r-- | core/definitions.mk | 19 | ||||
| -rw-r--r-- | core/main.mk | 6 | ||||
| -rw-r--r-- | core/package.mk | 12 | ||||
| -rw-r--r-- | core/pathmap.mk | 14 | ||||
| -rw-r--r-- | core/product.mk | 3 | ||||
| -rw-r--r-- | core/product_config.mk | 4 | ||||
| -rw-r--r-- | core/tasks/sdk-addon.mk | 23 | ||||
| -rw-r--r-- | core/version_defaults.mk | 4 |
9 files changed, 67 insertions, 34 deletions
diff --git a/core/build_id.mk b/core/build_id.mk index 78503c6..70bd235 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,4 +1,3 @@ - # # Copyright (C) 2008 The Android Open Source Project # @@ -14,9 +13,20 @@ # See the License for the specific language governing permissions and # limitations under the License. # + +# +# Defines branch-specific values. +# + # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "CRB01"). It must be a single word, and is +# (like "TC1-RC5"). It must be a single word, and is # capitalized by convention. +# +BUILD_ID := MR1 -export BUILD_ID=ICL53F +# DISPLAY_BUILD_NUMBER should only be set for development branches, +# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for +# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY +# is the same as BUILD_ID +DISPLAY_BUILD_NUMBER := true diff --git a/core/definitions.mk b/core/definitions.mk index 1a7cf4b..683ae16 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -843,11 +843,13 @@ define transform-proto-to-java @echo "Protoc: $@ <= $(PRIVATE_PROTO_SRC_FILES)" @rm -rf $(PRIVATE_PROTO_JAVA_OUTPUT_DIR) @mkdir -p $(PRIVATE_PROTO_JAVA_OUTPUT_DIR) -$(hide) $(PROTOC) \ - $(addprefix --proto_path=, $(PRIVATE_PROTO_INCLUDES)) \ - $(PRIVATE_PROTO_JAVA_OUTPUT_OPTION)=$(PRIVATE_PROTO_JAVA_OUTPUT_DIR) \ - $(PRIVATE_PROTOC_FLAGS) \ - $(PRIVATE_PROTO_SRC_FILES) +$(hide) for f in $(PRIVATE_PROTO_SRC_FILES); do \ + $(PROTOC) \ + $(addprefix --proto_path=, $(PRIVATE_PROTO_INCLUDES)) \ + $(PRIVATE_PROTO_JAVA_OUTPUT_OPTION)=$(PRIVATE_PROTO_JAVA_OUTPUT_DIR) \ + $(PRIVATE_PROTOC_FLAGS) \ + $$f; \ + done $(hide) touch $@ endef @@ -1586,10 +1588,9 @@ endef define add-dex-to-package $(if $(filter classes.dex,$(notdir $(PRIVATE_DEX_FILE))),\ $(hide) $(AAPT) add -k $@ $(PRIVATE_DEX_FILE),\ -$(eval _adtp_classes.dex := $(dir $(PRIVATE_DEX_FILE))/classes.dex)\ -$(hide) cp $(PRIVATE_DEX_FILE) $(_adtp_classes.dex) && \ -$(AAPT) add -k $@ $(_adtp_classes.dex) && \ -rm -f $(_adtp_classes.dex)) +$(hide) _adtp_classes_dex=$(dir $(PRIVATE_DEX_FILE))classes.dex; \ +cp $(PRIVATE_DEX_FILE) $$_adtp_classes_dex && \ +$(AAPT) add -k $@ $$_adtp_classes_dex && rm -f $$_adtp_classes_dex) endef define add-java-resources-to-package diff --git a/core/main.mk b/core/main.mk index 6841b36..569d4dc 100644 --- a/core/main.mk +++ b/core/main.mk @@ -444,6 +444,7 @@ subdirs += \ sdk/layoutopt \ sdk/ninepatch \ sdk/rule_api \ + sdk/lint \ sdk/sdkstats \ sdk/sdkmanager \ sdk/swtmenubar \ @@ -664,6 +665,11 @@ ifdef is_sdk_build $(info Removing from sdk:)$(foreach d,$(target_gnu_MODULES),$(info : $(d))) modules_to_install := \ $(filter-out $(target_gnu_MODULES),$(modules_to_install)) + + # Ensure every module listed in PRODUCT_PACKAGES gets something installed + $(foreach m, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES), \ + $(if $(strip $(ALL_MODULES.$(m).INSTALLED)),,\ + $(error Module '$(m)' in PRODUCT_PACKAGES has nothing to install!))) endif diff --git a/core/package.mk b/core/package.mk index 0cca209..52d52a2 100644 --- a/core/package.mk +++ b/core/package.mk @@ -295,6 +295,18 @@ jni_shared_libraries := \ $(addsuffix $(so_suffix), \ $(LOCAL_JNI_SHARED_LIBRARIES))) +# App explicitly requires the prebuilt NDK libstlport_shared.so. +# libstlport_shared.so should never go to the system image. +# Instead it should be packaged into the apk. +ifeq (stlport_shared,$(LOCAL_NDK_STL_VARIANT)) +ifndef LOCAL_NDK_VERSION +$(error LOCAL_NDK_VERSION has to be defined together with LOCAL_NDK_STL_VARIANT, \ + LOCAL_PACKAGE_NAME=$(LOCAL_PACKAGE_NAME)) +endif +jni_shared_libraries += \ + $(HISTORICAL_NDK_VERSIONS_ROOT)/android-ndk-r$(LOCAL_NDK_VERSION)/sources/cxx-stl/stlport/libs/$(TARGET_CPU_ABI)/libstlport_shared.so +endif + # Set the abi directory used by the local JNI shared libraries. # (Doesn't change how the local shared libraries are compiled, just # sets where they are stored in the apk.) diff --git a/core/pathmap.mk b/core/pathmap.mk index 6c6ff2e..60fbfd2 100644 --- a/core/pathmap.mk +++ b/core/pathmap.mk @@ -101,3 +101,17 @@ FRAMEWORKS_BASE_SUBDIRS := \ # FRAMEWORKS_BASE_JAVA_SRC_DIRS := \ $(addprefix frameworks/base/,$(FRAMEWORKS_BASE_SUBDIRS)) + +# +# A list of all source roots under frameworks/support. +# +FRAMEWORKS_SUPPORT_SUBDIRS := \ + v4 \ + v13 \ + +# +# A version of FRAMEWORKS_SUPPORT_SUBDIRS that is expanded to full paths from +# the root of the tree. +# +FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS := \ + $(addprefix frameworks/support/,$(FRAMEWORKS_SUPPORT_SUBDIRS)) diff --git a/core/product.mk b/core/product.mk index 0ab9ae0..f48d2be 100644 --- a/core/product.mk +++ b/core/product.mk @@ -77,12 +77,11 @@ _product_var_list := \ PRODUCT_EXTRA_RECOVERY_KEYS \ PRODUCT_PACKAGE_OVERLAYS \ DEVICE_PACKAGE_OVERLAYS \ - PRODUCT_CONTRIBUTORS_FILE \ PRODUCT_TAGS \ PRODUCT_SDK_ADDON_NAME \ PRODUCT_SDK_ADDON_COPY_FILES \ PRODUCT_SDK_ADDON_COPY_MODULES \ - PRODUCT_SDK_ADDON_DOC_MODULE \ + PRODUCT_SDK_ADDON_DOC_MODULES \ PRODUCT_DEFAULT_WIFI_CHANNELS \ PRODUCT_DEFAULT_DEV_CERTIFICATE \ diff --git a/core/product_config.mk b/core/product_config.mk index e063e42..c455723 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -286,10 +286,6 @@ endif PRODUCT_COPY_FILES := \ $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_COPY_FILES)) -# The HTML file containing the contributors to the project. -PRODUCT_CONTRIBUTORS_FILE := \ - $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_CONTRIBUTORS_FILE)) - # A list of property assignments, like "key = value", with zero or more # whitespace characters on either side of the '='. PRODUCT_PROPERTY_OVERRIDES := \ diff --git a/core/tasks/sdk-addon.mk b/core/tasks/sdk-addon.mk index f3aec65..5a24a00 100644 --- a/core/tasks/sdk-addon.mk +++ b/core/tasks/sdk-addon.mk @@ -69,26 +69,21 @@ $(foreach cf,$(files_to_copy), \ $(eval sdk_addon_deps += $(_dest)) \ ) -# We don't know about all of the docs files, so depend on the timestamp for -# that, and record the directory, and the packaging rule will just copy the +# We don't know about all of the docs files, so depend on the timestamps for +# them, and record the directories, and the packaging rule will just copy the # whole thing. -doc_module := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SDK_ADDON_DOC_MODULE)) -ifneq ($(doc_module),) - doc_timestamp := $(call doc-timestamp-for, $(doc_module)) - sdk_addon_deps += $(doc_timestamp) - $(full_target): PRIVATE_DOCS_DIR := $(OUT_DOCS)/$(doc_module) -else - $(full_target): PRIVATE_DOCS_DIR := -endif +doc_modules := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SDK_ADDON_DOC_MODULES)) +sdk_addon_deps += $(foreach dm, $(doc_modules), $(call doc-timestamp-for, $(dm))) +$(full_target): PRIVATE_DOCS_DIRS := $(addprefix $(OUT_DOCS)/, $(doc_modules)) $(full_target): PRIVATE_STAGING_DIR := $(staging) $(full_target): $(sdk_addon_deps) | $(ACP) @echo Packaging SDK Addon: $@ - $(hide) mkdir -p $(PRIVATE_STAGING_DIR)/docs/reference - $(hide) if [ -n "$(PRIVATE_DOCS_DIR)" ] ; then \ - $(ACP) -r $(PRIVATE_DOCS_DIR)/* $(PRIVATE_STAGING_DIR)/docs/reference ;\ - fi + $(hide) mkdir -p $(PRIVATE_STAGING_DIR)/docs + $(hide) for d in $(PRIVATE_DOCS_DIRS); do \ + $(ACP) -r $$d $(PRIVATE_STAGING_DIR)/docs ;\ + done $(hide) mkdir -p $(dir $@) $(hide) ( F=$$(pwd)/$@ ; cd $(PRIVATE_STAGING_DIR)/.. && zip -rq $$F * ) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index c5fabf1..091fc34 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -41,7 +41,7 @@ ifeq "" "$(PLATFORM_VERSION)" # which is the version that we reveal to the end user. # Update this value when the platform version changes (rather # than overriding it somewhere else). Can be an arbitrary string. - PLATFORM_VERSION := 4.0.2 + PLATFORM_VERSION := 4.0.3 endif ifeq "" "$(PLATFORM_SDK_VERSION)" @@ -53,7 +53,7 @@ ifeq "" "$(PLATFORM_SDK_VERSION)" # intermediate builds). During development, this number remains at the # SDK version the branch is based on and PLATFORM_VERSION_CODENAME holds # the code-name of the new development work. - PLATFORM_SDK_VERSION := 14 + PLATFORM_SDK_VERSION := 15 endif ifeq "" "$(PLATFORM_VERSION_CODENAME)" |