ffd4fee911
Merge "Revert "Allow system images larger than 2GiB."" into lmp-mr1-dev
2015-02-13 18:48:17 +00:00
2de68bbbf4
Revert "Allow system images larger than 2GiB."
...
This reverts commit cd082d4bfe
2015-02-13 18:47:51 +00:00
6368a18bb7
Merge "Load cts/build/config.mk after build/core/config.mk"
2015-02-13 18:33:49 +00:00
bacf5f8008
Load cts/build/config.mk after build/core/config.mk
...
So that the cts config.mk can use global variables set by the core build
system config.mk.
Change-Id: I2571564abbb53257eee54485a3357ab1305eb870
2015-02-13 10:28:40 -08:00
8b24d3bced
Merge "[Renderscript] making librsjni.so be packed with apks when v8.renderscript is needed, even for bundled apps."
2015-02-13 17:56:52 +00:00
4d88a3639b
Merge "Split the build of the CTS infrastructure from the tests."
2015-02-13 17:26:20 +00:00
5c938ffb33
Merge "Force make to check date of classes.jack after Jack run"
2015-02-13 01:09:09 +00:00
c919b0ba88
[Renderscript] making librsjni.so be packed with apks when
...
v8.renderscript is needed, even for bundled apps.
Bug: 19343399
Change-Id: I461e244be15e08d4525439bc042529314c84031e
2015-02-12 17:07:31 -08:00
1145b336f7
am 95627f6e: am a8b9a8c1: am 1f58c417: Support LOCAL_PREBUILT_JNI_LIBS in unbundled build.
...
* commit '95627f6e5434a8da33a99be72ae654e22a3b89f0':
Support LOCAL_PREBUILT_JNI_LIBS in unbundled build.
2015-02-12 23:05:52 +00:00
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
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
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
c2b6d3b32e
am b5a3e2fe: am 8f1965ed: Merge "Remove gdbclient from envsetup."
...
* commit 'b5a3e2fe9d85523f9e0ea3a0311ce7607b97a194':
Remove gdbclient from envsetup.
2015-02-12 21:36:33 +00:00
b5a3e2fe9d
am 8f1965ed: Merge "Remove gdbclient from envsetup."
...
* commit '8f1965ed0152c1f93358e3a424e9156b29c56813':
Remove gdbclient from envsetup.
2015-02-12 21:12:36 +00:00
8f1965ed01
Merge "Remove gdbclient from envsetup."
2015-02-12 21:02:49 +00:00
5932b63cb9
am f5a6279c: am bdfec89d: Merge "Increase BOARD_SYSTEMIMAGE_PARTITION_SIZE to 900MB for mips64."
...
* commit 'f5a6279c4c13bcd77ac57c56c32df2f4139afa81':
Increase BOARD_SYSTEMIMAGE_PARTITION_SIZE to 900MB for mips64.
2015-02-12 20:18:18 +00:00
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
bdfec89d96
Merge "Increase BOARD_SYSTEMIMAGE_PARTITION_SIZE to 900MB for mips64."
2015-02-12 19:58:40 +00:00
617be5ede5
Remove the unsets for removed gdbclient functions.
...
Change-Id: I6bb8b42dbc7ac45bec6b8267733f9b4d6212315f
2015-02-12 11:30:06 -08:00
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
e66d7c1de0
Support LOCAL_PREBUILT_JNI_LIBS in unbundled build.
...
Package up LOCAL_PREBUILT_JNI_LIBS when you do tapas (apps_only) build.
Change-Id: Ibdc920fee22d4940eebee080a940e8e9492c06cb
2015-02-12 11:29:41 -08:00
69d8279048
am 92e0682f: resolved conflicts for merge of 7fc55db3 to lmp-mr1-dev-plus-aosp
...
* commit '92e0682f05cafa5b67e2a1cfe7c5dd75db037db3':
core: remove dependencies on genext2fs
2015-02-12 17:27:04 +00:00
725dcdc395
am 05defc16: am d857abd1: am 151205c3: Merge "Bump generic_mips and generic_x86_64 system partition size" into lmp-mr1-dev
...
* commit '05defc16b6c8816ad18cf9a80ae9cc363fbf8ee4':
Bump generic_mips and generic_x86_64 system partition size
2015-02-12 04:45:57 +00:00
92e0682f05
resolved conflicts for merge of 7fc55db3 to lmp-mr1-dev-plus-aosp
...
Change-Id: I27b9c65d654d4cc8b806043de0ebaa5dbf7b7a7c
2015-02-11 20:05:03 -08:00
cad78c12fb
Do not use block_verify on target-files where feature is missing.
...
This will only be used when the block file format is at least
version 3. For V1/V2 (L, L MR1) block versions, fall back to
the old range_sha1 check.
Bug: 19357591
Change-Id: I7cb178b70d48ec3c98cdb88ed1c94cf7797a01d0
2015-02-11 19:28:08 -08:00
7fc55db30e
Merge "core: remove dependencies on genext2fs"
2015-02-12 01:53:41 +00:00
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
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
151205c37f
Merge "Bump generic_mips and generic_x86_64 system partition size" into lmp-mr1-dev
2015-02-12 00:59:27 +00:00
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
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
5139ce4916
Split the build of the CTS infrastructure from the tests.
...
This allows developers to build the test packages individually without
needing to build the entire CTS release.
bug: 18945639
Change-Id: Iedc162059617f683a16a6b80cb7b1a6e0674bba4
2015-02-11 14:12:14 -08:00
af439891e9
Merge "Temporarily add org.apache.http.legacy to the boot classpath."
2015-02-11 14:48:03 +00:00
f8136017fa
am 1cd422cd: 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 '1cd422cd3d67c0821b29c75e91cac764ce4d1b47':
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-11 02:54:59 +00:00
4978192ae0
am 89a87488: am b5df7d48: Merge "Add version strings from android-info.txt into build.prop"
...
* commit '89a87488db537eb6c78e6cd5d58ef32fcadc523d':
Add version strings from android-info.txt into build.prop
2015-02-11 02:50:06 +00:00
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
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
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
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
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
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
050f21cb00
Merge "Split up android.policy into framework.jar and services.jar 3/3"
2015-02-10 14:15:20 +00:00
2011e895dc
Temporarily add org.apache.http.legacy to the boot classpath.
...
This change is the stepping stone towards removing it altogether.
In order to remove it, we need a few changes to ART to properly
support compile time classpaths.
bug: 18027885
Change-Id: I70d5453ff88b8ba51c418fd72aaf78ac97869502
2015-02-10 13:45:06 +00:00
9d252e1009
Set up environmental variable PATH before calling releasetools scripts.
...
Some releasetools python sripts rely on $PATH to search for the
executables. With this change, you don't need to run lunch even after you
change the build system variable OUT_DIR.
Bug: 19320328
Change-Id: Ia44b11084fb1bdcceb60b1d33cb7e460c9b705a8
2015-02-09 17:20:06 -08:00
b5df7d4837
Merge "Add version strings from android-info.txt into build.prop"
2015-02-09 22:45:57 +00:00
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
4ec52a93d8
am 234d122e: am c6af9b8f: am 28b2b00a: Merge "Update vendor fingerprint." into lmp-mr1-dev
...
* commit '234d122ea62a43aa3a1d6cfbf11a75e5dbe3f8e0':
Update vendor fingerprint.
2015-02-09 04:14:09 +00:00
39a68ab310
am f8f91c94: am 3907eaf8: am cd082d4b: Allow system images larger than 2GiB.
...
* commit 'f8f91c94706a953f91bf75e919b4302db6a9a99f':
Allow system images larger than 2GiB.
2015-02-09 04:14:08 +00:00
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
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
Justin Harrison