OSDN Git Service
The Android Automerger [Mon, 13 Apr 2015 17:38:16 +0000 (10:38 -0700)]
merge in m-wireless-internal-release history after reset to m-wireless-internal-dev
The Android Automerger [Mon, 13 Apr 2015 13:50:32 +0000 (06:50 -0700)]
"MIZ13"
The Android Automerger [Mon, 13 Apr 2015 13:45:21 +0000 (06:45 -0700)]
merge in m-wireless-internal-release history after reset to
554b16da8c8f733b99cf8bfa922182866d1486df
The Android Automerger [Thu, 9 Apr 2015 16:56:59 +0000 (09:56 -0700)]
"MIZ09B"
The Android Automerger [Thu, 9 Apr 2015 13:49:54 +0000 (06:49 -0700)]
"MIZ09"
The Android Automerger [Thu, 9 Apr 2015 13:45:20 +0000 (06:45 -0700)]
merge in m-wireless-internal-release history after reset to
554b16da8c8f733b99cf8bfa922182866d1486df
The Android Automerger [Thu, 9 Apr 2015 06:58:57 +0000 (23:58 -0700)]
"MIZ08B"
The Android Automerger [Thu, 9 Apr 2015 06:54:15 +0000 (23:54 -0700)]
merge in m-wireless-internal-release history after reset to m-wireless-internal-dev
The Android Automerger [Wed, 8 Apr 2015 13:51:03 +0000 (06:51 -0700)]
"MIZ08"
The Android Automerger [Wed, 8 Apr 2015 13:45:16 +0000 (06:45 -0700)]
merge in m-wireless-internal-release history after reset to
554b16da8c8f733b99cf8bfa922182866d1486df
The Android Automerger [Tue, 7 Apr 2015 14:13:08 +0000 (07:13 -0700)]
"MIZ07"
The Android Automerger [Tue, 7 Apr 2015 13:45:29 +0000 (06:45 -0700)]
merge in m-wireless-internal-release history after reset to
554b16da8c8f733b99cf8bfa922182866d1486df
The Android Automerger [Mon, 6 Apr 2015 13:55:50 +0000 (06:55 -0700)]
"MIZ06"
The Android Automerger [Mon, 6 Apr 2015 13:45:31 +0000 (06:45 -0700)]
merge in m-wireless-internal-release history after reset to
554b16da8c8f733b99cf8bfa922182866d1486df
The Android Automerger [Thu, 2 Apr 2015 13:50:41 +0000 (06:50 -0700)]
"MIZ02"
The Android Automerger [Thu, 2 Apr 2015 13:45:23 +0000 (06:45 -0700)]
merge in m-wireless-internal-release history after reset to
554b16da8c8f733b99cf8bfa922182866d1486df
The Android Automerger [Wed, 1 Apr 2015 13:50:33 +0000 (06:50 -0700)]
"MIZ01"
The Android Automerger [Wed, 1 Apr 2015 13:45:17 +0000 (06:45 -0700)]
merge in m-wireless-internal-release history after reset to
554b16da8c8f733b99cf8bfa922182866d1486df
The Android Automerger [Tue, 31 Mar 2015 13:52:33 +0000 (06:52 -0700)]
"MIY90"
The Android Automerger [Tue, 31 Mar 2015 13:45:51 +0000 (06:45 -0700)]
merge in m-wireless-internal-release history after reset to
554b16da8c8f733b99cf8bfa922182866d1486df
The Android Automerger [Mon, 30 Mar 2015 13:49:57 +0000 (06:49 -0700)]
"MIY89"
The Android Automerger [Mon, 30 Mar 2015 13:45:12 +0000 (06:45 -0700)]
merge in m-wireless-internal-release history after reset to
554b16da8c8f733b99cf8bfa922182866d1486df
The Android Automerger [Sat, 28 Mar 2015 00:22:50 +0000 (17:22 -0700)]
"MIY85E"
The Android Automerger [Fri, 27 Mar 2015 17:46:03 +0000 (10:46 -0700)]
"MIY85D"
The Android Automerger [Fri, 27 Mar 2015 16:32:47 +0000 (09:32 -0700)]
"MIY85C"
The Android Automerger [Fri, 27 Mar 2015 04:10:11 +0000 (21:10 -0700)]
"MIY85B"
Bart Sears [Fri, 27 Mar 2015 01:35:14 +0000 (01:35 +0000)]
DO NOT MERGE - Bump version to 5.1.1
automerge:
1c3bf5c -s ours
* commit '
1c3bf5c39d281be4b437bc1a367c49b72c6e10b9':
DO NOT MERGE - Bump version to 5.1.1
The Android Automerger [Thu, 26 Mar 2015 13:50:22 +0000 (06:50 -0700)]
"MIY85"
The Android Automerger [Thu, 26 Mar 2015 13:45:12 +0000 (06:45 -0700)]
merge in m-wireless-internal-release history after reset to
ceb0b3c8cd6043713a3fd151c6d4a4c957f7f395
Bart Sears [Thu, 26 Mar 2015 04:04:38 +0000 (21:04 -0700)]
DO NOT MERGE - Bump version to 5.1.1
Bug:
19939307
Change-Id: I069f514fe6d3759aa7dde38627c54f7bed38c1bb
The Android Automerger [Wed, 25 Mar 2015 13:50:24 +0000 (06:50 -0700)]
"MIY84"
The Android Automerger [Wed, 25 Mar 2015 13:45:11 +0000 (06:45 -0700)]
merge in m-wireless-internal-release history after reset to
ceb0b3c8cd6043713a3fd151c6d4a4c957f7f395
The Android Automerger [Tue, 24 Mar 2015 13:50:53 +0000 (06:50 -0700)]
"MIY83"
The Android Automerger [Tue, 24 Mar 2015 13:45:14 +0000 (06:45 -0700)]
merge in m-wireless-internal-release history after reset to
ceb0b3c8cd6043713a3fd151c6d4a4c957f7f395
Ying Wang [Mon, 23 Mar 2015 18:08:02 +0000 (18:08 +0000)]
Add selinux and verity support to custom image generation.
automerge:
ad54a4d
* commit '
ad54a4dab520d84f76c9ad6a83be92b5563de24e':
Add selinux and verity support to custom image generation.
Ying Wang [Sat, 21 Mar 2015 00:43:02 +0000 (17:43 -0700)]
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
7d51a4029590b58e22071eed919d59a0ff205bef)
The Android Automerger [Mon, 23 Mar 2015 13:50:15 +0000 (06:50 -0700)]
"MIY82"
The Android Automerger [Mon, 23 Mar 2015 13:45:14 +0000 (06:45 -0700)]
merge in m-wireless-internal-release history after reset to
d461d4f03411f347770eca66fc2e63f1f371b7fd
Justin Morey [Thu, 19 Mar 2015 18:31:18 +0000 (18:31 +0000)]
resolved conflicts for merge of
68000907 to lmp-mr1-dev
automerge:
030b549
* commit '
030b5493147d47a726e9f3e0e474772b29ad3111':
Bump generic_x86_64 system partition size - DO NOT MERGE
The Android Automerger [Thu, 19 Mar 2015 13:52:07 +0000 (06:52 -0700)]
"MIY78"
The Android Automerger [Thu, 19 Mar 2015 13:45:29 +0000 (06:45 -0700)]
merge in m-wireless-internal-release history after reset to
ab0b128073f02231248f3abbcd88165aa3690ca1
Justin Morey [Thu, 19 Mar 2015 02:27:17 +0000 (21:27 -0500)]
resolved conflicts for merge of
68000907 to lmp-mr1-dev
Change-Id: I9f1a80746a5d945c704cd126efebca0941e27e47
Justin Morey [Wed, 18 Mar 2015 23:00:33 +0000 (23:00 +0000)]
am
02060b7b: Bump generic_x86_64 system partition size - DO NOT MERGE
* commit '
02060b7bddbb8728fa5a4ba5e0905e5a173bc682':
Bump generic_x86_64 system partition size - DO NOT MERGE
Justin Morey [Wed, 18 Mar 2015 19:57:16 +0000 (14:57 -0500)]
Bump generic_x86_64 system partition size - DO NOT MERGE
This makes it big enough to hold Orla, unbreaking the build
Change-Id: I5a131dfbaaa3aa2bb1bc24e4f859cc3507b671b0
Ying Wang [Wed, 18 Mar 2015 18:46:05 +0000 (18:46 +0000)]
Support to configure and build multiple custom images.
automerge:
ae61f50
* commit '
ae61f50a680d4a8e91274b35305dc2e24959abbe':
Support to configure and build multiple custom images.
Tao Bao [Wed, 18 Mar 2015 18:44:53 +0000 (18:44 +0000)]
Restrict the verification in block-based incremental OTAs
automerge:
daebaa6
* commit '
daebaa6ed3fbf4e7943e6c8290ec6b9233b542e9':
Restrict the verification in block-based incremental OTAs
The Android Automerger [Wed, 18 Mar 2015 13:50:08 +0000 (06:50 -0700)]
"MIY77"
The Android Automerger [Wed, 18 Mar 2015 13:45:13 +0000 (06:45 -0700)]
merge in m-wireless-internal-release history after reset to
597cfdb9db079994620333665db992de7c0a99a0
The Android Automerger [Tue, 17 Mar 2015 13:50:56 +0000 (06:50 -0700)]
"MIY76"
The Android Automerger [Tue, 17 Mar 2015 13:45:26 +0000 (06:45 -0700)]
merge in m-wireless-internal-release history after reset to
597cfdb9db079994620333665db992de7c0a99a0
The Android Automerger [Mon, 16 Mar 2015 13:49:45 +0000 (06:49 -0700)]
"MIY75"
The Android Automerger [Mon, 16 Mar 2015 13:45:22 +0000 (06:45 -0700)]
merge in m-wireless-internal-release history after reset to
597cfdb9db079994620333665db992de7c0a99a0
Ying Wang [Fri, 13 Mar 2015 01:30:39 +0000 (18:30 -0700)]
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
5fcf1094f9cf4d57c2598237f99621f254130d71)
The Android Automerger [Fri, 13 Mar 2015 16:08:34 +0000 (09:08 -0700)]
"MIY72"
The Android Automerger [Fri, 13 Mar 2015 16:04:15 +0000 (09:04 -0700)]
merge in m-wireless-internal-release history after reset to m-wireless-internal-dev
Tao Bao [Thu, 12 Mar 2015 19:32:37 +0000 (12:32 -0700)]
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
The Android Automerger [Thu, 12 Mar 2015 13:51:22 +0000 (06:51 -0700)]
"MIY71B"
Wink Saville [Thu, 26 Jun 2014 02:48:51 +0000 (19:48 -0700)]
Add support for PB_ENABLE_MALLOC in nanopb-c
There will be two version of the the nanopb-c library,
libnanopb-c-2.8.0 which doesn't support automatic malloc
and libnanopb-c-2.8.0-enable_malloc which does.
There will be two version of the the nanopb-c library,
libnanopb-c-2.8.0 which doesn't support automatic malloc
and libnanopb-c-2.8.0-enable_malloc which does.
Set LOCAL_PROTO_OPTIMIZE_TYPE=nanopb-c which doesn't support
malloc and set it to nanopb-c-enable_malloc which does.
For client code details see nanopb-api:
http://koti.kapsi.fi/jpa/nanopb/docs/reference.html
Change-Id: If238412463aabb5e1d556dfc9c464bcaf9e3333a
Wink Saville [Tue, 6 May 2014 22:45:57 +0000 (15:45 -0700)]
nanopb-c
Change-Id: I584d0a1e228338ea4ec3e5e2875d1ed329bc37f2
Ryosuke Matsuuchi [Fri, 27 Feb 2015 16:42:54 +0000 (16:42 +0000)]
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.
Ryosuke Matsuuchi [Fri, 27 Feb 2015 16:38:38 +0000 (16:38 +0000)]
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.
Ryosuke Matsuuchi [Fri, 27 Feb 2015 16:33:43 +0000 (16:33 +0000)]
am
2b486dc8: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
* commit '
2b486dc8c3af8cb82f49933356d1d49ad48da619':
doc: Add Japanese version of DAC/distribute/ page.
Ryosuke Matsuuchi [Fri, 27 Feb 2015 07:58:57 +0000 (07:58 +0000)]
Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
Ying Wang [Thu, 26 Feb 2015 23:28:21 +0000 (23:28 +0000)]
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
Ying Wang [Thu, 26 Feb 2015 23:15:32 +0000 (23:15 +0000)]
am
bf565365: Use ALL_MODULES..INSTALLED in modules-for-tag-list
* commit '
bf565365debd77424dbcf0877089f6f33100d8db':
Use ALL_MODULES.$(m).INSTALLED in modules-for-tag-list
Ying Wang [Tue, 18 Nov 2014 20:41:53 +0000 (12:41 -0800)]
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
0e36bfeb3ffc78658cda3ca6931c66fe3f5b3d3b)
Ying Wang [Tue, 18 Nov 2014 20:41:53 +0000 (12:41 -0800)]
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
Ying Wang [Fri, 20 Feb 2015 19:45:47 +0000 (19:45 +0000)]
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.
Ying Wang [Fri, 20 Feb 2015 19:38:32 +0000 (19:38 +0000)]
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.
Ying Wang [Fri, 20 Feb 2015 19:32:39 +0000 (19:32 +0000)]
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.
Ying Wang [Fri, 20 Feb 2015 19:24:41 +0000 (19:24 +0000)]
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.
Ying Wang [Fri, 20 Feb 2015 19:19:18 +0000 (19:19 +0000)]
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.
Ying Wang [Fri, 20 Feb 2015 19:09:45 +0000 (19:09 +0000)]
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.
Ying Wang [Fri, 20 Feb 2015 19:00:00 +0000 (19:00 +0000)]
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.
Ying Wang [Fri, 20 Feb 2015 18:53:06 +0000 (18:53 +0000)]
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.
Ying Wang [Fri, 20 Feb 2015 18:45:36 +0000 (18:45 +0000)]
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.
Ying Wang [Fri, 20 Feb 2015 18:38:29 +0000 (18:38 +0000)]
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.
Ying Wang [Fri, 20 Feb 2015 18:32:20 +0000 (18:32 +0000)]
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.
Ying Wang [Fri, 20 Feb 2015 18:28:48 +0000 (18:28 +0000)]
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.
Ying Wang [Fri, 20 Feb 2015 18:23:29 +0000 (18:23 +0000)]
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.
Ying Wang [Fri, 20 Feb 2015 18:18:07 +0000 (18:18 +0000)]
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.
Ying Wang [Fri, 20 Feb 2015 18:13:23 +0000 (18:13 +0000)]
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.
Ying Wang [Fri, 20 Feb 2015 18:05:42 +0000 (18:05 +0000)]
am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
c646bbfbd6e5d9ea1826199ca43aae1f922074dc':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 22 Feb 2013 17:59:17 +0000 (09:59 -0800)]
We shouldn't use temporary variable in the build recipe.
Use $@ instead.
Change-Id: Ida0960a453b3701383a31f698c3163a297c4bce5
(cherry picked from commit
b8a256a1facdae5b803335daf3c02af159749ab4)
Justin Harrison [Fri, 13 Feb 2015 18:48:17 +0000 (18:48 +0000)]
Merge "Revert "Allow system images larger than 2GiB."" into lmp-mr1-dev
Justin Harrison [Fri, 13 Feb 2015 18:47:51 +0000 (18:47 +0000)]
Revert "Allow system images larger than 2GiB."
This reverts commit
cd082d4bfe917b2e6b97436839cbbbc67c733c83.
Change-Id: Ie63e1ba70d907d2849164871bc7ec71c245f7af9
Ying Wang [Thu, 12 Feb 2015 19:29:41 +0000 (11:29 -0800)]
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
e66d7c1de0a888785cdbf697bebe53be7ed83380)
bohu [Thu, 12 Feb 2015 00:59:27 +0000 (00:59 +0000)]
Merge "Bump generic_mips and generic_x86_64 system partition size" into lmp-mr1-dev
bohu [Thu, 12 Feb 2015 00:51:54 +0000 (16:51 -0800)]
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
smain@google.com [Tue, 10 Feb 2015 19:12:49 +0000 (19:12 +0000)]
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
smain@google.com [Tue, 10 Feb 2015 19:05:42 +0000 (19:05 +0000)]
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
Jesse Zhao [Fri, 6 Feb 2015 22:21:06 +0000 (22:21 +0000)]
Merge "Update vendor fingerprint." into lmp-mr1-dev
Dan Albert [Tue, 27 Jan 2015 23:53:15 +0000 (15:53 -0800)]
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
Jesse Zhao [Fri, 6 Feb 2015 17:49:55 +0000 (09:49 -0800)]
Update vendor fingerprint.
Change-Id: I5d4abdff8b7b13e01271440f4d4f2ffe1b015b71
Bug:
19257598
smain@google.com [Thu, 5 Feb 2015 21:27:16 +0000 (13:27 -0800)]
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
Ryosuke Matsuuchi [Thu, 5 Feb 2015 12:56:48 +0000 (21:56 +0900)]
doc: Add Japanese version of DAC/distribute/ page.
Bug:
18847144
Change-Id: I1bce6f94149e31ddb45b5946951cf6877bf4bf3b
Ying Wang [Fri, 30 Jan 2015 02:08:00 +0000 (18:08 -0800)]
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
Jesse Zhao [Wed, 28 Jan 2015 23:30:53 +0000 (23:30 +0000)]
Merge "verify system and vendor image together before patching." into lmp-mr1-dev
Ying Wang [Tue, 27 Jan 2015 23:49:21 +0000 (15:49 -0800)]
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
Ying Wang [Thu, 22 Jan 2015 20:36:52 +0000 (20:36 +0000)]
Merge "Let apicheck check both the public API and system API." into lmp-mr1-dev