diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/Makefile | 2 | ||||
| -rw-r--r-- | core/pathmap.mk | 3 | ||||
| -rw-r--r-- | core/version_defaults.mk | 17 |
3 files changed, 21 insertions, 1 deletions
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 |