OSDN Git Service
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)
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
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
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)
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
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
Dirk Dougherty [Fri, 16 Jan 2015 18:03:42 +0000 (18:03 +0000)]
am
5a97f244: am
529a107f: Add new subtab under Distribute tab.
* commit '
5a97f24411df6ca7221343ac93f25decb99b6bea':
Add new subtab under Distribute tab.
Dirk Dougherty [Fri, 16 Jan 2015 00:58:59 +0000 (00:58 +0000)]
am
529a107f: Add new subtab under Distribute tab.
* commit '
529a107f9de5051b734fad4cecf1f971998aeade':
Add new subtab under Distribute tab.
Dirk Dougherty [Mon, 15 Dec 2014 23:10:06 +0000 (15:10 -0800)]
Add new subtab under Distribute tab.
Change-Id: I991c3295dea40629fdb9dde4a8ccbecad25f8136
Baligh Uddin [Sun, 11 Jan 2015 21:41:08 +0000 (13:41 -0800)]
Fix default locale issue
(cherry picked from commit
2a52f5c52693dd15c3ac154670081f70dfae4ba9)
Change-Id: Ic59dd105d60c2dd44f60ed9f57b7e1381924080d
Ying Wang [Fri, 9 Jan 2015 22:05:38 +0000 (14:05 -0800)]
Let apicheck check both the public API and system API.
Also "make update-api" updates both public API and system API files.
Bug:
18960664
Change-Id: I35e805816e07c8aa4deaeb84b1611923583325e1
Jesse Zhao [Tue, 6 Jan 2015 18:59:53 +0000 (10:59 -0800)]
verify system and vendor image together before patching.
Change-Id: Ia43657ed6cd8860b0edb78cc2dd6388c761e1f8b
Bug:
17919909
Ying Wang [Wed, 7 Jan 2015 00:49:20 +0000 (16:49 -0800)]
Remove ancient SDK cleanbuild rule
In anceint time we didn't have an "sdk" product so that we had to run
"make sdk" in a device product configuration.
Now we have SDK specific product configuration and we don't do "make
sdk" in device product configuration.
Change-Id: I40d58d51261498017bbe7e574c8128afc77e9b96
Jeff Arneson [Tue, 6 Jan 2015 02:00:09 +0000 (02:00 +0000)]
am
bb9eda64: am
2ff97d99: am
d194c6ac: Merge "Fix Documentation typo when showAnnotations is used with doclava" into lmp-docs
* commit '
bb9eda64a300bbbeffc58798f9af04d332544557':
Fix Documentation typo when showAnnotations is used with doclava
smain@google.com [Fri, 19 Dec 2014 17:08:33 +0000 (17:08 +0000)]
am
fdb9fa0e: am
351c908b: am
94e0b530: fix bug that allowed only one video in the shadowbox per page bug:
18777918
* commit '
fdb9fa0e2bdbcc8ffa6b33def29b74bab4ce91ac':
fix bug that allowed only one video in the shadowbox per page bug:
18777918
smain@google.com [Fri, 19 Dec 2014 17:08:05 +0000 (17:08 +0000)]
am
39bac022: am
bfe3fc64: am
bf644aa5: remove the Helpouts recruitment banner
* commit '
39bac0222bf10bc9f7dd1f3d58391903d669d35a':
remove the Helpouts recruitment banner
Ying Wang [Thu, 18 Dec 2014 22:53:52 +0000 (14:53 -0800)]
Fix using variable intermediates.COMMON before defining.
In commit
e9dd9f2bf we moved "include $(BUILD_SYSTEM)/android_manifest.mk"
forward before the variable intermediates.COMMON gets defined. That's a
mistake.
This change replaced the tentative variables
package_expected_intermediates_COMMON and guessed_intermediates with
their proper counterparts defined in base_rules.mk.
If their values differ in the two file, that's an error and we should
fix.
Bug:
18168693
Change-Id: I2bf17b0476b4a7f97810fbb0bde7630eb8878b53
Jeff Arneson [Thu, 18 Dec 2014 17:05:23 +0000 (17:05 +0000)]
am
2ff97d99: am
d194c6ac: Merge "Fix Documentation typo when showAnnotations is used with doclava" into lmp-docs
* commit '
2ff97d99266623997c09f5af937f98bc8bb2ee65':
Fix Documentation typo when showAnnotations is used with doclava
Jeff Arneson [Thu, 18 Dec 2014 17:00:15 +0000 (17:00 +0000)]
am
d194c6ac: Merge "Fix Documentation typo when showAnnotations is used with doclava" into lmp-docs
* commit '
d194c6ac80007532596a614c86e3c68e129957e7':
Fix Documentation typo when showAnnotations is used with doclava
Jeff Arneson [Thu, 18 Dec 2014 16:50:12 +0000 (16:50 +0000)]
Merge "Fix Documentation typo when showAnnotations is used with doclava" into lmp-docs
Ying Wang [Wed, 29 Oct 2014 22:48:32 +0000 (15:48 -0700)]
Add support for prebuilt AARs.
- You can give a .aar as source file to a prebuilt static Java library
module. The build system will set up dependencies and rules to extract
classes.jar and other resource files.
- To build against a prebuilt AAR module, use:
LOCAL_STATIC_JAVA_AAR_LIBRARIES := <module names of aar prebuilt AARs>
The build system will set up rules to merge the library's
AndroidManifest.xml with the main AndroidManifest.xml, add the AAR's
resource dirs and link/merge the AAR's classes.jar.
Bug:
18168693
Change-Id: Ic2c1d20572a93bd98dbc72f8a39e26b459e442c2
(cherry picked from commit
e9dd9f2bfceed3b5f630b0edbe3feb7f34548d8b)
smain@google.com [Wed, 17 Dec 2014 20:20:20 +0000 (20:20 +0000)]
am
d742274e: am
b05558cf: am
3de83c1b: make shadowbox video always centered to fit the window height
* commit '
d742274e14a048805a74311b0e5a25e03fc2465c':
make shadowbox video always centered to fit the window height
smain@google.com [Wed, 17 Dec 2014 03:31:06 +0000 (03:31 +0000)]
am
351c908b: am
94e0b530: fix bug that allowed only one video in the shadowbox per page bug:
18777918
* commit '
351c908b757fcfee03d5f15b4a29cb9a48f93f46':
fix bug that allowed only one video in the shadowbox per page bug:
18777918
smain@google.com [Wed, 17 Dec 2014 03:25:14 +0000 (03:25 +0000)]
am
94e0b530: fix bug that allowed only one video in the shadowbox per page bug:
18777918
* commit '
94e0b530868c56547ee05e84534fa68a1f6346f7':
fix bug that allowed only one video in the shadowbox per page bug:
18777918
smain@google.com [Wed, 17 Dec 2014 03:07:08 +0000 (19:07 -0800)]
fix bug that allowed only one video in the shadowbox per page
bug:
18777918
Change-Id: I07c75f795128165e2f1472112cf8ba1a1ee782c7
Jeff Arneson [Tue, 16 Dec 2014 23:11:12 +0000 (15:11 -0800)]
Fix Documentation typo when showAnnotations is used with doclava
Bug:
18711752
Change-Id: I1b5fce05063733388f65a6ddddf2522ea14e9e5f
smain@google.com [Tue, 16 Dec 2014 18:20:31 +0000 (18:20 +0000)]
am
bfe3fc64: am
bf644aa5: remove the Helpouts recruitment banner
* commit '
bfe3fc64add62518b619a052193269d3281475b9':
remove the Helpouts recruitment banner
smain@google.com [Tue, 16 Dec 2014 18:13:09 +0000 (18:13 +0000)]
am
bf644aa5: remove the Helpouts recruitment banner
* commit '
bf644aa564263120fdc61a2578aa2466fbc1d55a':
remove the Helpouts recruitment banner
smain@google.com [Tue, 16 Dec 2014 18:05:03 +0000 (10:05 -0800)]
remove the Helpouts recruitment banner
Change-Id: Iea8e241c24964dd76315a0dc0585f0c23841f650
Joe Fernandez [Tue, 16 Dec 2014 03:42:03 +0000 (03:42 +0000)]
am
b96b2a4a: am
91f2ba64: am
a4417712: Merge "docs: SHA update in sdkpage.cs" into lmp-docs
* commit '
b96b2a4ae621e1bd8529ef50bc00ddc048207ca3':
docs: SHA update in sdkpage.cs
smain@google.com [Tue, 16 Dec 2014 03:41:58 +0000 (03:41 +0000)]
am
2881d6f3: am
9f88a60d: am
481f15c1: set youtube player lang based on user pref and enable captions when not English
* commit '
2881d6f31b9daf9a3d701671eae3297040d84799':
set youtube player lang based on user pref and enable captions when not English
smain@google.com [Tue, 16 Dec 2014 03:40:27 +0000 (03:40 +0000)]
am
2c3ae43f: am
29e06142: am
d24088c0: add analytics event to track from which page a video was started
* commit '
2c3ae43f9e8329d7f0c24192fe1fd400d1a870b2':
add analytics event to track from which page a video was started
smain@google.com [Tue, 16 Dec 2014 03:39:31 +0000 (03:39 +0000)]
am
3ff2fd14: am
d7dbaf5c: am
ed677d7a: update analytics event for searches to make query case-insensitive and save the URL instead of doc title.
* commit '
3ff2fd14b1276e3b9c0473bd987c1bb34925ef86':
update analytics event for searches to make query case-insensitive and save the URL instead of doc title.
Michael Runge [Mon, 15 Dec 2014 21:35:18 +0000 (21:35 +0000)]
Merge "Rewrite ro.vendor.build.fingerprint/thumbprint on signing" into lmp-mr1-dev
smain@google.com [Mon, 15 Dec 2014 18:00:18 +0000 (18:00 +0000)]
am
b05558cf: am
3de83c1b: make shadowbox video always centered to fit the window height
* commit '
b05558cf01a42214efd0d8c6484c62a7b0212947':
make shadowbox video always centered to fit the window height
smain@google.com [Mon, 15 Dec 2014 17:54:02 +0000 (17:54 +0000)]
am
3de83c1b: make shadowbox video always centered to fit the window height
* commit '
3de83c1bcdf1229b51db7dbf9331611c596a478c':
make shadowbox video always centered to fit the window height
smain@google.com [Sat, 13 Dec 2014 03:06:52 +0000 (19:06 -0800)]
make shadowbox video always centered to fit the window height
Change-Id: I03f8ffac555dbbbbd5538fedf13413aca031fd74
Joe Fernandez [Sat, 13 Dec 2014 00:55:39 +0000 (00:55 +0000)]
am
91f2ba64: am
a4417712: Merge "docs: SHA update in sdkpage.cs" into lmp-docs
* commit '
91f2ba648f4187cea415ddc826ef155afe7e8122':
docs: SHA update in sdkpage.cs
Joe Fernandez [Sat, 13 Dec 2014 00:48:20 +0000 (00:48 +0000)]
am
a4417712: Merge "docs: SHA update in sdkpage.cs" into lmp-docs
* commit '
a4417712657f15cd8b36132bd642b54443cee1f0':
docs: SHA update in sdkpage.cs
Joe Fernandez [Sat, 13 Dec 2014 00:43:10 +0000 (00:43 +0000)]
Merge "docs: SHA update in sdkpage.cs" into lmp-docs
smain@google.com [Sat, 13 Dec 2014 00:30:28 +0000 (00:30 +0000)]
am
9f88a60d: am
481f15c1: set youtube player lang based on user pref and enable captions when not English
* commit '
9f88a60d5cb57552f88c26d7531ee235415dd381':
set youtube player lang based on user pref and enable captions when not English
smain@google.com [Sat, 13 Dec 2014 00:21:31 +0000 (00:21 +0000)]
am
481f15c1: set youtube player lang based on user pref and enable captions when not English
* commit '
481f15c172f06048f2934dac88e04e140d61041f':
set youtube player lang based on user pref and enable captions when not English
Rich Slogar [Fri, 12 Dec 2014 22:25:45 +0000 (14:25 -0800)]
docs: SHA update in sdkpage.cs
Change-Id: I2c94b1af228295a3650d17e2c00023e5b52ec1b9
smain@google.com [Fri, 12 Dec 2014 19:57:27 +0000 (11:57 -0800)]
set youtube player lang based on user pref and enable captions when not English
Change-Id: I3208074713d3f7b571a22a7ef8f18a9131827e98
smain@google.com [Fri, 12 Dec 2014 19:53:32 +0000 (19:53 +0000)]
am
29e06142: am
d24088c0: add analytics event to track from which page a video was started
* commit '
29e06142fdb2b6225d38f0ce141d28156bbdfea3':
add analytics event to track from which page a video was started
smain@google.com [Fri, 12 Dec 2014 19:46:26 +0000 (19:46 +0000)]
am
d24088c0: add analytics event to track from which page a video was started
* commit '
d24088c08de24b6cb5efeecec406e5e9180c0b8b':
add analytics event to track from which page a video was started
smain@google.com [Fri, 12 Dec 2014 19:31:13 +0000 (11:31 -0800)]
add analytics event to track from which page a video was started
Change-Id: I9ba1f992c09fb9e18c55bca5bf3892e50f37012a
smain@google.com [Fri, 12 Dec 2014 18:42:58 +0000 (18:42 +0000)]
am
d7dbaf5c: am
ed677d7a: update analytics event for searches to make query case-insensitive and save the URL instead of doc title.
* commit '
d7dbaf5c14cf1e6669df0d21f552a9b21cb63fb7':
update analytics event for searches to make query case-insensitive and save the URL instead of doc title.
smain@google.com [Fri, 12 Dec 2014 18:29:36 +0000 (18:29 +0000)]
am
ed677d7a: update analytics event for searches to make query case-insensitive and save the URL instead of doc title.
* commit '
ed677d7a0e3491824584391d7255d113696bad85':
update analytics event for searches to make query case-insensitive and save the URL instead of doc title.
smain@google.com [Fri, 12 Dec 2014 18:19:17 +0000 (10:19 -0800)]
update analytics event for searches to make query case-insensitive
and save the URL instead of doc title.
Change-Id: Iad8c5f4873173f6964fc4ebffee8aef878891a8e
Dianne Hackborn [Fri, 12 Dec 2014 00:19:51 +0000 (00:19 +0000)]
am
934b04d3: (-s ours) am
27fad66a: Merge "DO NOT MERGE. Bump version to 5.0.2." into lmp-dev
* commit '
934b04d3767974934d3d2e90e6196955f5b83d0c':
DO NOT MERGE. Bump version to 5.0.2.
Dianne Hackborn [Thu, 11 Dec 2014 22:29:46 +0000 (22:29 +0000)]
am
27fad66a: Merge "DO NOT MERGE. Bump version to 5.0.2." into lmp-dev
* commit '
27fad66a8c730e58b3f2aab56edc8c6078b4283e':
DO NOT MERGE. Bump version to 5.0.2.
Dianne Hackborn [Thu, 11 Dec 2014 22:25:31 +0000 (22:25 +0000)]
Merge "DO NOT MERGE. Bump version to 5.0.2." into lmp-dev