am 03474237: Merge change 4054 into donut

Merge commit '0347423753fb5d7207aa1ea93a8429f59468eb41'

* commit '0347423753fb5d7207aa1ea93a8429f59468eb41':
  build 'updater' binary for use in OTA packages
  Add VpnServices to PRODUCT_PACKAGES.
This commit is contained in:
Android (Google) Code Review 2009-06-14 21:12:39 -07:00 committed by The Android Open Source Project
commit 622a564e8f
2 changed files with 3 additions and 1 deletions

View File

@ -845,7 +845,8 @@ endef
built_ota_tools := \
$(call intermediates-dir-for,EXECUTABLES,applypatch)/applypatch \
$(call intermediates-dir-for,EXECUTABLES,check_prereq)/check_prereq
$(call intermediates-dir-for,EXECUTABLES,check_prereq)/check_prereq \
$(call intermediates-dir-for,EXECUTABLES,updater)/updater
$(BUILT_TARGET_FILES_PACKAGE): PRIVATE_OTA_TOOLS := $(built_ota_tools)
# Depending on the various images guarantees that the underlying

View File

@ -22,6 +22,7 @@ PRODUCT_PACKAGES := \
SettingsProvider \
TelephonyProvider \
TtsService \
VpnServices \
UserDictionaryProvider \
PackageInstaller \
WebSearchProvider \