diff options
| -rw-r--r-- | CleanSpec.mk | 2 | ||||
| -rw-r--r-- | core/Makefile | 2 | ||||
| -rw-r--r-- | core/pathmap.mk | 3 | ||||
| -rw-r--r-- | core/version_defaults.mk | 17 | ||||
| -rw-r--r-- | target/product/aosp_base_telephony.mk | 3 | ||||
| -rw-r--r-- | target/product/full_base.mk | 1 | ||||
| -rw-r--r-- | target/product/telephony.mk | 1 | ||||
| -rwxr-xr-x | tools/buildinfo.sh | 2 |
8 files changed, 28 insertions, 3 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 7778118..64d84e3 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -369,6 +369,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) + # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/core/Makefile b/core/Makefile index 7da3b23..22dcee1 100644 --- a/core/Makefile +++ b/core/Makefile @@ -204,6 +204,8 @@ endif BUILD_DISPLAY_ID="$(BUILD_DISPLAY_ID)" \ BUILD_NUMBER="$(BUILD_NUMBER)" \ PLATFORM_VERSION="$(PLATFORM_VERSION)" \ + PLATFORM_SECURITY_PATCH="$(PLATFORM_SECURITY_PATCH)" \ + PLATFORM_BASE_OS="$(PLATFORM_BASE_OS)" \ PLATFORM_SDK_VERSION="$(PLATFORM_SDK_VERSION)" \ PLATFORM_PREVIEW_SDK_VERSION="$(PLATFORM_PREVIEW_SDK_VERSION)" \ PLATFORM_VERSION_CODENAME="$(PLATFORM_VERSION_CODENAME)" \ diff --git a/core/pathmap.mk b/core/pathmap.mk index 97db9e6..b300ff5 100644 --- a/core/pathmap.mk +++ b/core/pathmap.mk @@ -108,7 +108,6 @@ FRAMEWORKS_SUPPORT_SUBDIRS := \ annotations \ v4 \ v7/gridlayout \ - v7/appcompat \ v7/cardview \ v7/mediarouter \ v7/palette \ @@ -137,6 +136,7 @@ FRAMEWORKS_MULTIDEX_SUBDIRS := \ FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS := \ $(addprefix frameworks/support/,$(FRAMEWORKS_SUPPORT_SUBDIRS)) \ $(addprefix frameworks/,$(FRAMEWORKS_MULTIDEX_SUBDIRS)) \ + frameworks/support/v7/appcompat/src \ frameworks/support/v7/recyclerview/src # @@ -144,6 +144,7 @@ FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS := \ # FRAMEWORKS_SUPPORT_JAVA_LIBRARIES := \ $(foreach dir,$(FRAMEWORKS_SUPPORT_SUBDIRS),android-support-$(subst /,-,$(dir))) \ + android-support-v7-appcompat \ android-support-v7-recyclerview \ android-support-multidex \ android-support-multidex-instrumentation diff --git a/core/version_defaults.mk b/core/version_defaults.mk index efb2bee..483c8f2 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -24,6 +24,7 @@ # DEFAULT_APP_TARGET_SDK # BUILD_ID # BUILD_NUMBER +# SECURITY_PATCH # # Look for an optional file containing overrides of the defaults, @@ -97,6 +98,22 @@ ifeq "" "$(DEFAULT_APP_TARGET_SDK)" endif endif +ifeq "" "$(PLATFORM_SECURITY_PATCH)" + # Used to indicate the security patch that has been applied to the device. + # Can be an arbitrary string, but must be a single word. + # + # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. + PLATFORM_SECURITY_PATCH := +endif + +ifeq "" "$(PLATFORM_BASE_OS)" + # Used to indicate the base os applied to the device. + # Can be an arbitrary string, but must be a single word. + # + # If there is no $PLATFORM_BASE_OS set, keep it empty. + PLATFORM_BASE_OS := +endif + ifeq "" "$(BUILD_ID)" # Used to signify special builds. E.g., branches and/or releases, # like "M5-RC7". Can be an arbitrary string, but must be a single diff --git a/target/product/aosp_base_telephony.mk b/target/product/aosp_base_telephony.mk index f326a00..0d4e333 100644 --- a/target/product/aosp_base_telephony.mk +++ b/target/product/aosp_base_telephony.mk @@ -14,3 +14,6 @@ # limitations under the License. # $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) + +PRODUCT_PACKAGES += \ + messaging diff --git a/target/product/full_base.mk b/target/product/full_base.mk index d8dad79..3b547c8 100644 --- a/target/product/full_base.mk +++ b/target/product/full_base.mk @@ -35,7 +35,6 @@ PRODUCT_PACKAGES += \ MagicSmokeWallpapers \ NoiseField \ PhaseBeam \ - VisualizationWallpapers \ PhotoTable # Additional settings used in all AOSP builds diff --git a/target/product/telephony.mk b/target/product/telephony.mk index 084f86c..919d024 100644 --- a/target/product/telephony.mk +++ b/target/product/telephony.mk @@ -21,7 +21,6 @@ PRODUCT_PACKAGES := \ CarrierConfig \ Dialer \ CallLogBackup \ - Mms \ rild PRODUCT_COPY_FILES := \ diff --git a/tools/buildinfo.sh b/tools/buildinfo.sh index 6cd9499..5c199b8 100755 --- a/tools/buildinfo.sh +++ b/tools/buildinfo.sh @@ -11,6 +11,8 @@ echo "ro.build.version.preview_sdk=$PLATFORM_PREVIEW_SDK_VERSION" echo "ro.build.version.codename=$PLATFORM_VERSION_CODENAME" echo "ro.build.version.all_codenames=$PLATFORM_VERSION_ALL_CODENAMES" echo "ro.build.version.release=$PLATFORM_VERSION" +echo "ro.build.version.security_patch=$PLATFORM_SECURITY_PATCH" +echo "ro.build.version.base_os=$PLATFORM_BASE_OS" echo "ro.build.date=`date`" echo "ro.build.date.utc=`date +%s`" echo "ro.build.type=$TARGET_BUILD_TYPE" |