Commit Graph

19712 Commits

Author SHA1 Message Date
Dirk Dougherty 26b600676b Increment metadata files for new families pages.
Change-Id: I9df9bde9bcd04c19c92006cff337619b8c3594e7
2015-04-13 18:30:39 -07:00
Bart Sears 1c3bf5c39d DO NOT MERGE - Bump version to 5.1.1
Bug: 19939307
Change-Id: I069f514fe6d3759aa7dde38627c54f7bed38c1bb
2015-03-25 21:04:38 -07:00
Ying Wang ad54a4dab5 Add selinux and verity support to custom image generation.
New custom image configuration variables:
- CUSTOM_IMAGE_SELINUX, set to "true" if the image supports selinux.
- CUSTOM_IMAGE_SUPPORT_VERITY, set to "true" if the product supports verity.
- CUSTOM_IMAGE_VERITY_BLOCK_DEVICE

Also changed the staging directory name to the mount point, like we do
for other images built by the build system.

Bug: 19609718
Change-Id: I6bbf06b79eee63e4c77834f2e6f1d5a7f7e00a12
(cherry picked from commit 7d51a40295)
2015-03-23 17:50:16 +00:00
Justin Morey 030b549314 resolved conflicts for merge of 68000907 to lmp-mr1-dev
Change-Id: I9f1a80746a5d945c704cd126efebca0941e27e47
2015-03-18 21:29:09 -05:00
Justin Morey 68000907e3 am 02060b7b: Bump generic_x86_64 system partition size - DO NOT MERGE
* commit '02060b7bddbb8728fa5a4ba5e0905e5a173bc682':
  Bump generic_x86_64 system partition size - DO NOT MERGE
2015-03-18 23:00:33 +00:00
Justin Morey 02060b7bdd Bump generic_x86_64 system partition size - DO NOT MERGE
This makes it big enough to hold Orla, unbreaking the build

Change-Id: I5a131dfbaaa3aa2bb1bc24e4f859cc3507b671b0
2015-03-18 21:04:14 +00:00
Ying Wang ae61f50a68 Support to configure and build multiple custom images.
Build additional images requested by the product makefile.
This script gives the ability to build multiple additional images and
you can configure what modules/files to include in each image.
1. Define PRODUCT_CUSTOM_IMAGE_MAKEFILES in your product makefile.
   PRODUCT_CUSTOM_IMAGE_MAKEFILES is a list of makefiles.
   Each makefile configures an image.
   For image configuration makefile foo/bar/xyz.mk, the built image
   file name
   will be xyz.img. So make sure they won't conflict.
2. In each image's configuration makefile, you can define variables:
  - CUSTOM_IMAGE_MOUNT_POINT, the mount point, such as "oem", "odm"
    etc.
  - CUSTOM_IMAGE_PARTITION_SIZE
  - CUSTOM_IMAGE_FILE_SYSTEM_TYPE
  - CUSTOM_IMAGE_DICT_FILE, a text file defining a dictionary
    accepted by BuildImage() in tools/releasetools/build_image.py.
  - CUSTOM_IMAGE_MODULES, a list of module names you want to include
    in the image; Not only the module itself will be installed to proper
    path in the image, you can also piggyback additional files/directories
    with the module's LOCAL_PICKUP_FILES.
  - CUSTOM_IMAGE_COPY_FILES, a list of "<src>:<dest>" to be copied to
    the image. <dest> is relativ to the root of the image.

To build all those images, run "make custom_images".

Bug: 19609718
Change-Id: Ic73587e08503a251be27797c7b00329716051927
(cherry picked from commit 5fcf1094f9)
2015-03-14 00:06:54 +00:00
Tao Bao daebaa6ed3 Restrict the verification in block-based incremental OTAs
BlockImageDiff has three versions. Only the incremental OTAs generated
with the latest version (3) can be re-applied to the system that's
already on the target build. Otherwise, operations like move will make
unconditional changes and damage the system. During the verification
phase, abort the OTA update if BlockImageDiff is less than 3 and it
doesn't match the checksum of the source build.

Change-Id: I3a776495b69e1d174fcb01b10e40c0e912914fd8
2015-03-12 13:47:04 -07:00
Ryosuke Matsuuchi 3c242c5ddb am 4b2537f3: am e34b4ec4: am 2b486dc8: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
* commit '4b2537f39d7ac29258908e1a38ebdf085fd44c5f':
  doc: Add Japanese version of DAC/distribute/ page.
2015-02-27 16:42:54 +00:00
Ryosuke Matsuuchi 4b2537f39d am e34b4ec4: am 2b486dc8: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
* commit 'e34b4ec484faf5dac8286bb17bedeed0e83a6962':
  doc: Add Japanese version of DAC/distribute/ page.
2015-02-27 16:38:38 +00:00
Ryosuke Matsuuchi e34b4ec484 am 2b486dc8: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
* commit '2b486dc8c3af8cb82f49933356d1d49ad48da619':
  doc: Add Japanese version of DAC/distribute/ page.
2015-02-27 16:33:43 +00:00
Ryosuke Matsuuchi 2b486dc8c3 Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs 2015-02-27 07:58:58 +00:00
Ying Wang a6d5250ae1 am 41e3685f: am bf565365: Use ALL_MODULES..INSTALLED in modules-for-tag-list
* commit '41e3685f97d4b8034034c89676e88f7a7caa47c2':
  Use ALL_MODULES.$(m).INSTALLED in modules-for-tag-list
2015-02-26 23:28:21 +00:00
Ying Wang 41e3685f97 am bf565365: Use ALL_MODULES..INSTALLED in modules-for-tag-list
* commit 'bf565365debd77424dbcf0877089f6f33100d8db':
  Use ALL_MODULES.$(m).INSTALLED in modules-for-tag-list
2015-02-26 23:15:32 +00:00
Ying Wang bf565365de Use ALL_MODULES.$(m).INSTALLED in modules-for-tag-list
Previously we store tag's installed modules in a separate variable
ALL_MODULE_TAGS.$(tag). However we only record the main installed file
for a module, but omit affiliated files like .odex.
With this change, we handle the tagged module the same way as modules in
PRODUCT_PACKAGES.

Change-Id: I7972528a4df5a4ba8bc98930864da9672d32d7fe
(cherry picked from commit 0e36bfeb3f)
2015-02-26 22:18:18 +00:00
Ying Wang 0e36bfeb3f Use ALL_MODULES.$(m).INSTALLED in modules-for-tag-list
Previously we store tag's installed modules in a separate variable
ALL_MODULE_TAGS.$(tag). However we only record the main installed file
for a module, but omit affiliated files like .odex.
With this change, we handle the tagged module the same way as modules in
PRODUCT_PACKAGES.

Change-Id: I7972528a4df5a4ba8bc98930864da9672d32d7fe
2015-02-26 14:12:25 -08:00
Ying Wang 56dedc22ba am dae9bb50: am 64f0f2ad: am f7cb5fc2: am 1c2ca593: am 289c9563: am 6be36e0c: am 7447c516: am 89a0e52e: am 01b35afe: am a9c86ef0: am f7bb2237: am f2ac0682: am 7eba7cc4: am fe3eeb8c: am c5ec654c: am c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit 'dae9bb50a5e733221a23c8d7458165cdf34028fc':
  We shouldn't use temporary variable in the build recipe.
2015-02-20 19:45:47 +00:00
Ying Wang dae9bb50a5 am 64f0f2ad: am f7cb5fc2: am 1c2ca593: am 289c9563: am 6be36e0c: am 7447c516: am 89a0e52e: am 01b35afe: am a9c86ef0: am f7bb2237: am f2ac0682: am 7eba7cc4: am fe3eeb8c: am c5ec654c: am c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '64f0f2ad235f1020a0f75dd91cbef9e5a622cc28':
  We shouldn't use temporary variable in the build recipe.
2015-02-20 19:38:32 +00:00
Ying Wang 64f0f2ad23 am f7cb5fc2: am 1c2ca593: am 289c9563: am 6be36e0c: am 7447c516: am 89a0e52e: am 01b35afe: am a9c86ef0: am f7bb2237: am f2ac0682: am 7eba7cc4: am fe3eeb8c: am c5ec654c: am c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit 'f7cb5fc2b1c38e7b12c1bb9ae348e048be3d2eeb':
  We shouldn't use temporary variable in the build recipe.
2015-02-20 19:32:39 +00:00
Ying Wang f7cb5fc2b1 am 1c2ca593: am 289c9563: am 6be36e0c: am 7447c516: am 89a0e52e: am 01b35afe: am a9c86ef0: am f7bb2237: am f2ac0682: am 7eba7cc4: am fe3eeb8c: am c5ec654c: am c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '1c2ca59317b193d0aaaebdd8c8b7c5aefcbecc3d':
  We shouldn't use temporary variable in the build recipe.
2015-02-20 19:24:41 +00:00
Ying Wang 1c2ca59317 am 289c9563: am 6be36e0c: am 7447c516: am 89a0e52e: am 01b35afe: am a9c86ef0: am f7bb2237: am f2ac0682: am 7eba7cc4: am fe3eeb8c: am c5ec654c: am c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '289c9563e396f9b9d49487dc8807318fc7542549':
  We shouldn't use temporary variable in the build recipe.
2015-02-20 19:19:18 +00:00
Ying Wang 289c9563e3 am 6be36e0c: am 7447c516: am 89a0e52e: am 01b35afe: am a9c86ef0: am f7bb2237: am f2ac0682: am 7eba7cc4: am fe3eeb8c: am c5ec654c: am c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '6be36e0c5eb9ff65727b8f90591ba594deb040b4':
  We shouldn't use temporary variable in the build recipe.
2015-02-20 19:09:45 +00:00
Ying Wang 6be36e0c5e am 7447c516: am 89a0e52e: am 01b35afe: am a9c86ef0: am f7bb2237: am f2ac0682: am 7eba7cc4: am fe3eeb8c: am c5ec654c: am c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '7447c516722041d8df4cf18571f148aac6a57eb9':
  We shouldn't use temporary variable in the build recipe.
2015-02-20 19:00:00 +00:00
Ying Wang 7447c51672 am 89a0e52e: am 01b35afe: am a9c86ef0: am f7bb2237: am f2ac0682: am 7eba7cc4: am fe3eeb8c: am c5ec654c: am c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '89a0e52e4097b2a080292ae65d39db05aceed500':
  We shouldn't use temporary variable in the build recipe.
2015-02-20 18:53:06 +00:00
Ying Wang 89a0e52e40 am 01b35afe: am a9c86ef0: am f7bb2237: am f2ac0682: am 7eba7cc4: am fe3eeb8c: am c5ec654c: am c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '01b35afe186050fd6140ad758a18ce13c9008c22':
  We shouldn't use temporary variable in the build recipe.
2015-02-20 18:45:36 +00:00
Ying Wang 01b35afe18 am a9c86ef0: am f7bb2237: am f2ac0682: am 7eba7cc4: am fe3eeb8c: am c5ec654c: am c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit 'a9c86ef0959b50043503ab39608ab25c7cdc94b2':
  We shouldn't use temporary variable in the build recipe.
2015-02-20 18:38:29 +00:00
Ying Wang a9c86ef095 am f7bb2237: am f2ac0682: am 7eba7cc4: am fe3eeb8c: am c5ec654c: am c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit 'f7bb2237c72d668068c6af0234311aeb096a2af2':
  We shouldn't use temporary variable in the build recipe.
2015-02-20 18:32:20 +00:00
Ying Wang f7bb2237c7 am f2ac0682: am 7eba7cc4: am fe3eeb8c: am c5ec654c: am c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit 'f2ac06828e41578bd13434fee7fcfee0f76419f9':
  We shouldn't use temporary variable in the build recipe.
2015-02-20 18:28:48 +00:00
Ying Wang f2ac06828e am 7eba7cc4: am fe3eeb8c: am c5ec654c: am c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '7eba7cc49b527d6d6605810c1de497c4477db03f':
  We shouldn't use temporary variable in the build recipe.
2015-02-20 18:23:29 +00:00
Ying Wang 7eba7cc49b am fe3eeb8c: am c5ec654c: am c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit 'fe3eeb8cf0fd03d020a0b49c4def441056eae157':
  We shouldn't use temporary variable in the build recipe.
2015-02-20 18:18:07 +00:00
Ying Wang fe3eeb8cf0 am c5ec654c: am c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit 'c5ec654c6edb01c129c5371321fba1cc6e28940d':
  We shouldn't use temporary variable in the build recipe.
2015-02-20 18:13:23 +00:00
Ying Wang c5ec654c6e am c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit 'c646bbfbd6e5d9ea1826199ca43aae1f922074dc':
  We shouldn't use temporary variable in the build recipe.
2015-02-20 18:05:42 +00:00
Ying Wang c646bbfbd6 We shouldn't use temporary variable in the build recipe.
Use $@ instead.

Change-Id: Ida0960a453b3701383a31f698c3163a297c4bce5
(cherry picked from commit b8a256a1fa)
2015-02-20 01:49:32 +00:00
Justin Harrison ffd4fee911 Merge "Revert "Allow system images larger than 2GiB."" into lmp-mr1-dev 2015-02-13 18:48:17 +00:00
Justin Harrison 2de68bbbf4 Revert "Allow system images larger than 2GiB."
This reverts commit cd082d4bfe.

Change-Id: Ie63e1ba70d907d2849164871bc7ec71c245f7af9
2015-02-13 18:47:51 +00:00
Ying Wang 1f58c41742 Support LOCAL_PREBUILT_JNI_LIBS in unbundled build.
Package up LOCAL_PREBUILT_JNI_LIBS when you do tapas (apps_only) build.

Change-Id: Ibdc920fee22d4940eebee080a940e8e9492c06cb
(cherry picked from commit e66d7c1de0)
2015-02-12 22:40:24 +00:00
bohu 151205c37f Merge "Bump generic_mips and generic_x86_64 system partition size" into lmp-mr1-dev 2015-02-12 00:59:27 +00:00
bohu 4c49eaadf3 Bump generic_mips and generic_x86_64 system partition size
This fixes the sdk_google_phone_mips and sdk_google_phone_x86-64
builds

Change-Id: I971d02b07a6aa917d7e0f3750b48e657205aae52
2015-02-11 16:51:54 -08:00
smain@google.com 8cde3e71e7 am cf80e847: am d162be5b: change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
* commit 'cf80e8479bc71538902ac07df91fff8d544a174e':
  change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
2015-02-10 19:12:49 +00:00
smain@google.com cf80e8479b am d162be5b: change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
* commit 'd162be5b5f65ba0311374242d48303f120398d48':
  change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
2015-02-10 19:05:42 +00:00
Jesse Zhao 28b2b00adb Merge "Update vendor fingerprint." into lmp-mr1-dev 2015-02-06 22:21:06 +00:00
Dan Albert cd082d4bfe Allow system images larger than 2GiB.
Python 2.7's zipfile implementation wrongly thinks that zip64 is
required for files larger than 2GiB. We can work around this by
adjusting their limit. Note that `zipfile.writestr()` will not work
for strings larger than 2GiB. The Python interpreter sometimes rejects
strings that large (though it isn't clear to me exactly what
circumstances cause this). `zipfile.write()` must be used directly to
work around this.

This mess can be avoided if we port to python3.

Bug: 18015246
Change-Id: I8a476d99c5efdef6ea408373b706e9fbd3a798be
2015-02-06 13:24:06 -08:00
Jesse Zhao 2625d27151 Update vendor fingerprint.
Change-Id: I5d4abdff8b7b13e01271440f4d4f2ffe1b015b71
Bug: 19257598
2015-02-06 09:50:06 -08:00
smain@google.com d162be5b5f change video analytics to distinguish between start and resume events.
also scrub out any additional parameters from the videoId before passing to analytics

Change-Id: Idf3351028e62d0d03c0f680a904bb83ef8353797
2015-02-05 17:49:49 -08:00
Ryosuke Matsuuchi 37c84ae309 doc: Add Japanese version of DAC/distribute/ page.
Bug: 18847144
Change-Id: I1bce6f94149e31ddb45b5946951cf6877bf4bf3b
2015-02-05 21:56:48 +09:00
Ying Wang 7245b4e2be Support dpi specific aapt flags.
With this support, you can set dpi-specific aapt flags like:
$(LOCAL_PACKAGE_NAME)_aapt_flags_hdpi := --version-code 100 \
                                         --version-name "100
which will override the --version-code and --version-name set in the
base apk's LOCAL_AAPT_FLAGS.

Bug := 18388705

Change-Id: Ie79d7b1b6bbf7463bce51ddae04ba81384ec58dc
2015-01-30 02:17:52 +00:00
Jesse Zhao 0c9384d512 Merge "verify system and vendor image together before patching." into lmp-mr1-dev 2015-01-28 23:30:54 +00:00
Ying Wang cb73599b25 Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES non-fatal.
It's pain to maintain an inactive product's list of
PRODUCT_FACTORY_RAMDISK_MODULES or PRODUCT_FACTORY_BUNDLE_MODULES.
Just show a warning if a module name becomes dangling.

Bug: 18779515
Change-Id: I3d137ed59feb005b186ed2a3519465da3d8f45c3
2015-01-27 15:49:21 -08:00
Ying Wang 507ea383aa Merge "Let apicheck check both the public API and system API." into lmp-mr1-dev 2015-01-22 20:36:53 +00:00
Dirk Dougherty 48141e0599 am 5a97f244: am 529a107f: Add new subtab under Distribute tab.
* commit '5a97f24411df6ca7221343ac93f25decb99b6bea':
  Add new subtab under Distribute tab.
2015-01-16 18:03:42 +00:00