Commit graph

19848 commits

Author SHA1 Message Date
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
The Android Automerger
aebd9cce59 "LKY51" 2015-02-20 06:06:26 -08:00
The Android Automerger
b3700c347b merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-02-20 06:05:17 -08: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
The Android Automerger
adafbf8896 "LKY50" 2015-02-19 06:06:27 -08:00
The Android Automerger
d65134bf15 merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-02-19 06:05:10 -08:00
The Android Automerger
8d2a26eb32 "LKY49" 2015-02-18 06:06:33 -08:00
The Android Automerger
d23a2c4600 merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-02-18 06:05:10 -08:00
The Android Automerger
b34979a5a3 "LKY48" 2015-02-17 06:05:52 -08:00
The Android Automerger
bf0ec53d06 merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-02-17 06:05:16 -08:00
The Android Automerger
d5ba03a05a "LKY47" 2015-02-16 06:05:48 -08:00
The Android Automerger
d89eb9f9e0 merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-02-16 06:05:25 -08:00
The Android Automerger
ca274c9ffb "LKY45" 2015-02-14 06:05:39 -08:00
The Android Automerger
f543c69196 merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-02-14 06:05:09 -08:00
Justin Harrison
070eea05f2 am ffd4fee9: Merge "Revert "Allow system images larger than 2GiB."" into lmp-mr1-dev
* commit 'ffd4fee911ee43fbec7b08b829d15a7593421dba':
  Revert "Allow system images larger than 2GiB."
2015-02-13 20:23:29 +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
The Android Automerger
1cf30e247c "LKY44" 2015-02-13 06:06:53 -08:00
The Android Automerger
9de81505a2 merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-02-13 06:05:11 -08:00
Ying Wang
a8b9a8c1ed am 1f58c417: Support LOCAL_PREBUILT_JNI_LIBS in unbundled build.
* commit '1f58c41742b6a063138226e6483010486f56657f':
  Support LOCAL_PREBUILT_JNI_LIBS in unbundled build.
2015-02-12 22:46:54 +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
The Android Automerger
9d188197c2 "LKY43" 2015-02-12 06:07:21 -08:00
The Android Automerger
82a99f1752 merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-02-12 06:05:23 -08:00
bohu
d857abd1ff 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
2015-02-12 01:04:48 +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
The Android Automerger
63b89fae0b "LKY42" 2015-02-11 06:07:54 -08:00
The Android Automerger
addcae28f9 merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-02-11 06:05:14 -08:00
smain@google.com
19b8c2f776 am 8cde3e71: 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 '8cde3e71e77472b70da6e810ec1e12c30243ef61':
  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:19:33 +00: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
The Android Automerger
22a1064b41 "LKY41" 2015-02-10 06:07:21 -08:00
The Android Automerger
3d20ceae26 merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-02-10 06:05:26 -08:00
The Android Automerger
d44fa00ea0 "LKY40" 2015-02-09 06:05:35 -08:00
The Android Automerger
a977996598 merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-02-09 06:05:06 -08:00
The Android Automerger
b91d95b928 "LKY38" 2015-02-07 06:06:18 -08:00
The Android Automerger
ee784c55f3 merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-02-07 06:05:12 -08:00
Jesse Zhao
c6af9b8f4a am 28b2b00a: Merge "Update vendor fingerprint." into lmp-mr1-dev
* commit '28b2b00adb7b77a5a6e5654e078c887ed5a425aa':
  Update vendor fingerprint.
2015-02-06 22:27:27 +00:00
Jesse Zhao
28b2b00adb Merge "Update vendor fingerprint." into lmp-mr1-dev 2015-02-06 22:21:06 +00:00
Dan Albert
3907eaf8b7 am cd082d4b: Allow system images larger than 2GiB.
* commit 'cd082d4bfe917b2e6b97436839cbbbc67c733c83':
  Allow system images larger than 2GiB.
2015-02-06 21:41:09 +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
The Android Automerger
d4f93be6cb "LKY37" 2015-02-06 06:06:47 -08:00
The Android Automerger
8312d5e809 merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-02-06 06:05:09 -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
The Android Automerger
272339e165 "LKY36" 2015-02-05 06:09:03 -08:00
The Android Automerger
a03256395f merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-02-05 06:05:27 -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