Ying Wang
564abd1642
am 0f672c6a: (-s ours) Merge "[DO NOT MERGE] Trim the AOSP PLATFORM_VERSION."
...
* commit '0f672c6aad22dde39a172ae0b5f0b76068008f30':
[DO NOT MERGE] Trim the AOSP PLATFORM_VERSION.
2015-02-20 00:46:40 +00:00
Ying Wang
0f672c6aad
Merge "[DO NOT MERGE] Trim the AOSP PLATFORM_VERSION."
2015-02-20 00:40:56 +00:00
Ying Wang
5bcc416d54
[DO NOT MERGE] Trim the AOSP PLATFORM_VERSION.
...
With the long PLATFORM_VERSION, if you have also a long device/product
name and/or a long username, ro.build.fingerprint can easily exceed the
system property's length limit of 92 bytes.
This mitigates the risk a little bit.
Bug: 15593959
Change-Id: I9e316025227b30aa6887c9ce0065364fdbb9fc8f
2015-02-20 00:34:35 +00:00
Bill Yi
251412b472
Merge commit 'b89ec38113a22d09b0832ed2d3cb8fc413a14a75' into HEAD
2015-02-19 14:30:26 -08:00
Dan Albert
0badfcebe7
Merge "Remove the unsets for removed gdbclient functions."
2015-02-17 21:01:19 +00:00
Elliott Hughes
24374e5752
Merge "Remove ARCH_ARM_HAVE_TLS_REGISTER."
2015-02-17 17:47:10 +00:00
Elliott Hughes
e033c6df7d
Remove ARCH_ARM_HAVE_TLS_REGISTER.
...
This was only needed for platform builds, and was removed in the gap between
armv5 being removed and being added back again for tapas builds. Otherwise it
would have been removed back then.
(I suspect that we don't need the system.prop file in here, either, but I
don't really know how to test that.)
Change-Id: I212ff7b3568b5d5ff3cc66150ec7c4fa0b8cac92
2015-02-13 20:51:12 -08:00
Justin Harrison
b89ec38113
am 070eea05: am ffd4fee9: Merge "Revert "Allow system images larger than 2GiB."" into lmp-mr1-dev
...
* commit '070eea05f2f2d47aa873fd1e79160eb8529a0eb8':
Revert "Allow system images larger than 2GiB."
2015-02-13 20:37:10 +00: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
Ying Wang
95627f6e54
am a8b9a8c1: am 1f58c417: Support LOCAL_PREBUILT_JNI_LIBS in unbundled build.
...
* commit 'a8b9a8c1ed5e7d7e0cdc39c2c10f964b95a98e7a':
Support LOCAL_PREBUILT_JNI_LIBS in unbundled build.
2015-02-12 22:58:44 +00: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
Dan Albert
b5a3e2fe9d
am 8f1965ed: Merge "Remove gdbclient from envsetup."
...
* commit '8f1965ed0152c1f93358e3a424e9156b29c56813':
Remove gdbclient from envsetup.
2015-02-12 21:12:36 +00:00
Dan Albert
8f1965ed01
Merge "Remove gdbclient from envsetup."
2015-02-12 21:02:49 +00:00
Ying Wang
f5a6279c4c
am bdfec89d: Merge "Increase BOARD_SYSTEMIMAGE_PARTITION_SIZE to 900MB for mips64."
...
* commit 'bdfec89d96819cf78faa4a61635c2ec536b4545f':
Increase BOARD_SYSTEMIMAGE_PARTITION_SIZE to 900MB for mips64.
2015-02-12 20:11:19 +00:00
Ying Wang
bdfec89d96
Merge "Increase BOARD_SYSTEMIMAGE_PARTITION_SIZE to 900MB for mips64."
2015-02-12 19:58:40 +00:00
Dan Albert
617be5ede5
Remove the unsets for removed gdbclient functions.
...
Change-Id: I6bb8b42dbc7ac45bec6b8267733f9b4d6212315f
2015-02-12 11:30:06 -08:00
Dan Albert
f9631fd9db
Remove gdbclient from envsetup.
...
gdbclient is being promoted to a real script:
https://android-review.googlesource.com/#/c/131831/
Change-Id: I4bb70ad44cec0ebf62d9e8e355c22ed8b708868b
2015-02-12 11:29:43 -08:00
JP Abgrall
92e0682f05
resolved conflicts for merge of 7fc55db3
to lmp-mr1-dev-plus-aosp
...
Change-Id: I27b9c65d654d4cc8b806043de0ebaa5dbf7b7a7c
2015-02-11 20:05:03 -08:00
JP Abgrall
7fc55db30e
Merge "core: remove dependencies on genext2fs"
2015-02-12 01:53:41 +00:00
bohu
05defc16b6
am d857abd1: am 151205c3: Merge "Bump generic_mips and generic_x86_64 system partition size" into lmp-mr1-dev
...
* commit 'd857abd1ff8b3436d15765e93b0d4d0ec1a9147a':
Bump generic_mips and generic_x86_64 system partition size
2015-02-12 01:16:22 +00: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
JP Abgrall
7bb75e4f6c
core: remove dependencies on genext2fs
...
We don't use EXT2 for bootimage anymore.
This will allow getting rid of external/genext2fs
Bug: 19282953
Change-Id: Ie56528c7877036d2501a09888a4420637f9cd647
2015-02-11 15:04:59 -08:00
smain@google.com
1cd422cd3d
am 19b8c2f7: 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 '19b8c2f776036288dfad8983e38419c3d4316fc9':
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 23:21:02 +00:00
Douglas Leung
206cbdb68e
Increase BOARD_SYSTEMIMAGE_PARTITION_SIZE to 900MB for mips64.
...
This is needed to build mips64 ART in quick mode.
Change-Id: I8a9e62389a3d4edb84bf1d6814d6594565bc98ba
2015-02-10 11:55:12 -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
Andres Morales
89a87488db
am b5df7d48: Merge "Add version strings from android-info.txt into build.prop"
...
* commit 'b5df7d483772d1dd08a1d5c8614f38a79e43ec12':
Add version strings from android-info.txt into build.prop
2015-02-10 16:52:58 +00:00
Andres Morales
b5df7d4837
Merge "Add version strings from android-info.txt into build.prop"
2015-02-09 22:45:57 +00:00
Andres Morales
085a0ce756
Add version strings from android-info.txt into build.prop
...
Allows runtime checking of expected baseband/bootloader.
Change-Id: Iccb053fee5f72f4e082a5c3482c0710b13ee7eb8
2015-02-09 08:33:31 -08:00
Jesse Zhao
234d122ea6
am c6af9b8f: am 28b2b00a: Merge "Update vendor fingerprint." into lmp-mr1-dev
...
* commit 'c6af9b8f4a09cc4208ad119218f57022d6fead5b':
Update vendor fingerprint.
2015-02-07 00:06:13 +00:00
Dan Albert
f8f91c9470
am 3907eaf8: am cd082d4b: Allow system images larger than 2GiB.
...
* commit '3907eaf8b7c6f7209c4cb11a6b8b66a34f292151':
Allow system images larger than 2GiB.
2015-02-07 00:06:10 +00: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
Andres Morales
8859f02949
am b998054f: Merge "Add system/build.prop dependency on vendor/bootimg"
...
* commit 'b998054f50043c23e8599ee3cfae058ac378c5cb':
Add system/build.prop dependency on vendor/bootimg
2015-02-06 18:23:12 +00:00
Andres Morales
b998054f50
Merge "Add system/build.prop dependency on vendor/bootimg"
2015-02-06 18:11:30 +00: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
Andres Morales
a09f2f44cc
Add system/build.prop dependency on vendor/bootimg
...
When incremental builds only affect the system partition,
the build.prop file for other partitions might go out of
date.
Add a dependency on system/build.prop s.t. when
it's rebuilt,
the fingerprints are updated on the other
partition's build.prop's.
Bug:19058575
Change-Id: Iea7b761e0800c402eb4ce1154e8f6af5a17f7b06
2015-02-05 12:42:43 -08:00
Elliott Hughes
1888ab842a
am 9edd7649: Merge "Remove mkyaffs2image references."
...
* commit '9edd76494d4378bd740dd22a2eb4f5d0eb0db40f':
Remove mkyaffs2image references.
2015-02-05 18:47:25 +00:00
Elliott Hughes
5755589141
am ed556858: Merge "Make sure we keep building grep now it\'s broken out from toolbox."
...
* commit 'ed556858262a7311f0145f1d1c605f7cec7c18c4':
Make sure we keep building grep now it's broken out from toolbox.
2015-02-05 18:47:21 +00:00
Elliott Hughes
9edd76494d
Merge "Remove mkyaffs2image references."
2015-02-05 04:04:42 +00:00
Elliott Hughes
65d4186f85
Remove mkyaffs2image references.
...
Change-Id: I1d112515bc92353a5b48ec668e1cadfb51ecdaad
2015-02-04 19:58:09 -08:00