OSDN Git Service
The Android Automerger [Wed, 18 Mar 2015 13:06:27 +0000 (06:06 -0700)]
"LKY77"
The Android Automerger [Wed, 18 Mar 2015 13:05:20 +0000 (06:05 -0700)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
The Android Automerger [Tue, 17 Mar 2015 13:06:41 +0000 (06:06 -0700)]
"LKY76"
The Android Automerger [Tue, 17 Mar 2015 13:05:08 +0000 (06:05 -0700)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
The Android Automerger [Mon, 16 Mar 2015 13:05:29 +0000 (06:05 -0700)]
"LKY75"
The Android Automerger [Mon, 16 Mar 2015 13:05:10 +0000 (06:05 -0700)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
The Android Automerger [Sat, 14 Mar 2015 13:06:04 +0000 (06:06 -0700)]
"LKY73"
The Android Automerger [Sat, 14 Mar 2015 13:05:13 +0000 (06:05 -0700)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
Ying Wang [Sat, 14 Mar 2015 00:17:52 +0000 (00:17 +0000)]
am
ae61f50a: Support to configure and build multiple custom images.
* commit '
ae61f50a680d4a8e91274b35305dc2e24959abbe':
Support to configure and build multiple custom images.
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 13:07:04 +0000 (06:07 -0700)]
"LKY72"
The Android Automerger [Fri, 13 Mar 2015 13:06:04 +0000 (06:06 -0700)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
Tao Bao [Thu, 12 Mar 2015 22:56:28 +0000 (22:56 +0000)]
am
daebaa6e: Restrict the verification in block-based incremental OTAs
* commit '
daebaa6ed3fbf4e7943e6c8290ec6b9233b542e9':
Restrict the verification in block-based incremental OTAs
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:06:47 +0000 (06:06 -0700)]
"LKY71"
The Android Automerger [Thu, 12 Mar 2015 13:05:20 +0000 (06:05 -0700)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
The Android Automerger [Wed, 11 Mar 2015 13:05:53 +0000 (06:05 -0700)]
"LKY70"
The Android Automerger [Wed, 11 Mar 2015 13:05:11 +0000 (06:05 -0700)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
The Android Automerger [Tue, 10 Mar 2015 13:06:38 +0000 (06:06 -0700)]
"LKY69"
The Android Automerger [Tue, 10 Mar 2015 13:05:10 +0000 (06:05 -0700)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
The Android Automerger [Mon, 9 Mar 2015 13:05:23 +0000 (06:05 -0700)]
"LKY68"
The Android Automerger [Mon, 9 Mar 2015 13:05:08 +0000 (06:05 -0700)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
The Android Automerger [Sat, 7 Mar 2015 14:05:32 +0000 (06:05 -0800)]
"LKY66"
The Android Automerger [Sat, 7 Mar 2015 14:05:07 +0000 (06:05 -0800)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
The Android Automerger [Fri, 6 Mar 2015 14:06:10 +0000 (06:06 -0800)]
"LKY65"
The Android Automerger [Fri, 6 Mar 2015 14:05:13 +0000 (06:05 -0800)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
The Android Automerger [Thu, 5 Mar 2015 14:06:19 +0000 (06:06 -0800)]
"LKY64"
The Android Automerger [Thu, 5 Mar 2015 14:05:10 +0000 (06:05 -0800)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
The Android Automerger [Wed, 4 Mar 2015 14:05:48 +0000 (06:05 -0800)]
"LKY63"
The Android Automerger [Wed, 4 Mar 2015 14:05:08 +0000 (06:05 -0800)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
The Android Automerger [Tue, 3 Mar 2015 14:07:33 +0000 (06:07 -0800)]
"LKY62"
The Android Automerger [Tue, 3 Mar 2015 14:05:09 +0000 (06:05 -0800)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
The Android Automerger [Tue, 3 Mar 2015 00:40:06 +0000 (16:40 -0800)]
LKY61B
The Android Automerger [Mon, 2 Mar 2015 14:05:26 +0000 (06:05 -0800)]
"LKY61"
The Android Automerger [Mon, 2 Mar 2015 14:05:11 +0000 (06:05 -0800)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
The Android Automerger [Sat, 28 Feb 2015 14:06:24 +0000 (06:06 -0800)]
"LKY59"
The Android Automerger [Sat, 28 Feb 2015 14:05:15 +0000 (06:05 -0800)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
Ryosuke Matsuuchi [Fri, 27 Feb 2015 16:51:04 +0000 (16:51 +0000)]
am
3c242c5d: am
4b2537f3: am
e34b4ec4: am
2b486dc8: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
* commit '
3c242c5ddb8b867b916875c8e05c260a9d8571b6':
doc: Add Japanese version of DAC/distribute/ page.
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.
The Android Automerger [Fri, 27 Feb 2015 14:06:11 +0000 (06:06 -0800)]
"LKY58"
The Android Automerger [Fri, 27 Feb 2015 14:05:17 +0000 (06:05 -0800)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
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:37:04 +0000 (23:37 +0000)]
am
a6d5250a: am
41e3685f: am
bf565365: Use ALL_MODULES..INSTALLED in modules-for-tag-list
* commit '
a6d5250ae1e9032f2360962084e5969ccaa1ffd8':
Use ALL_MODULES.$(m).INSTALLED in modules-for-tag-list
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:16:21 +0000 (23:16 +0000)]
am
0e36bfeb: Use ALL_MODULES..INSTALLED in modules-for-tag-list
* commit '
0e36bfeb3ffc78658cda3ca6931c66fe3f5b3d3b':
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
The Android Automerger [Thu, 26 Feb 2015 14:06:32 +0000 (06:06 -0800)]
"LKY57"
The Android Automerger [Thu, 26 Feb 2015 14:05:10 +0000 (06:05 -0800)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
The Android Automerger [Wed, 25 Feb 2015 14:06:13 +0000 (06:06 -0800)]
"LKY56"
The Android Automerger [Wed, 25 Feb 2015 14:05:14 +0000 (06:05 -0800)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
The Android Automerger [Tue, 24 Feb 2015 14:06:08 +0000 (06:06 -0800)]
"LKY55"
The Android Automerger [Tue, 24 Feb 2015 14:05:08 +0000 (06:05 -0800)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
The Android Automerger [Mon, 23 Feb 2015 14:05:52 +0000 (06:05 -0800)]
"LKY54"
The Android Automerger [Mon, 23 Feb 2015 14:05:26 +0000 (06:05 -0800)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
The Android Automerger [Sat, 21 Feb 2015 14:06:43 +0000 (06:06 -0800)]
"LKY52"
The Android Automerger [Sat, 21 Feb 2015 14:05:08 +0000 (06:05 -0800)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
Ying Wang [Fri, 20 Feb 2015 19:50:27 +0000 (19:50 +0000)]
am
56dedc22: 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 bui
* commit '
56dedc22ba137be34e0f82e097d1bdf5cd99ceed':
We shouldn't use temporary variable in the build recipe.
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.
The Android Automerger [Fri, 20 Feb 2015 14:06:26 +0000 (06:06 -0800)]
"LKY51"
The Android Automerger [Fri, 20 Feb 2015 14:05:17 +0000 (06:05 -0800)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
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)
The Android Automerger [Thu, 19 Feb 2015 14:06:27 +0000 (06:06 -0800)]
"LKY50"
The Android Automerger [Thu, 19 Feb 2015 14:05:10 +0000 (06:05 -0800)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
The Android Automerger [Wed, 18 Feb 2015 14:06:33 +0000 (06:06 -0800)]
"LKY49"
The Android Automerger [Wed, 18 Feb 2015 14:05:10 +0000 (06:05 -0800)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
The Android Automerger [Tue, 17 Feb 2015 14:05:52 +0000 (06:05 -0800)]
"LKY48"
The Android Automerger [Tue, 17 Feb 2015 14:05:16 +0000 (06:05 -0800)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
The Android Automerger [Mon, 16 Feb 2015 14:05:48 +0000 (06:05 -0800)]
"LKY47"
The Android Automerger [Mon, 16 Feb 2015 14:05:25 +0000 (06:05 -0800)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
The Android Automerger [Sat, 14 Feb 2015 14:05:39 +0000 (06:05 -0800)]
"LKY45"
The Android Automerger [Sat, 14 Feb 2015 14:05:09 +0000 (06:05 -0800)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
Justin Harrison [Fri, 13 Feb 2015 20:23:29 +0000 (20:23 +0000)]
am
ffd4fee9: Merge "Revert "Allow system images larger than 2GiB."" into lmp-mr1-dev
* commit '
ffd4fee911ee43fbec7b08b829d15a7593421dba':
Revert "Allow system images larger than 2GiB."
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
The Android Automerger [Fri, 13 Feb 2015 14:06:53 +0000 (06:06 -0800)]
"LKY44"
The Android Automerger [Fri, 13 Feb 2015 14:05:11 +0000 (06:05 -0800)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
Ying Wang [Thu, 12 Feb 2015 22:46:54 +0000 (22:46 +0000)]
am
1f58c417: Support LOCAL_PREBUILT_JNI_LIBS in unbundled build.
* commit '
1f58c41742b6a063138226e6483010486f56657f':
Support LOCAL_PREBUILT_JNI_LIBS in unbundled build.
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)
The Android Automerger [Thu, 12 Feb 2015 14:07:21 +0000 (06:07 -0800)]
"LKY43"
The Android Automerger [Thu, 12 Feb 2015 14:05:23 +0000 (06:05 -0800)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
bohu [Thu, 12 Feb 2015 01:04:48 +0000 (01:04 +0000)]
am
151205c3: Merge "Bump generic_mips and generic_x86_64 system partition size" into lmp-mr1-dev
* commit '
151205c37fc14201cf9be99e5083d467075a1ba0':
Bump generic_mips and generic_x86_64 system partition size
OSDN Git Service
