Commit Graph

21888 Commits

Author SHA1 Message Date
Yohann Roussel
d2a76c14bf Change built module of static java libraries
Set LOCAL_BUILT_MODULE of static java libraries when Jack is enabled
to classes.jack instead of javalib.jar.
This allows that running mm in those libraries will build classes.jack
instead of the jar.

Change-Id: I96b4b227848e971df96331b3f0cc731e856be349
2015-02-18 22:54:18 +01:00
Elliott Hughes
1f382fa4f7 am 6f7b05bb: am 24374e57: Merge "Remove ARCH_ARM_HAVE_TLS_REGISTER."
* commit '6f7b05bbb8ef645f029dd3432b32c76a5b1ee3df':
  Remove ARCH_ARM_HAVE_TLS_REGISTER.
2015-02-17 18:04:54 +00:00
Elliott Hughes
6f7b05bbb8 am 24374e57: Merge "Remove ARCH_ARM_HAVE_TLS_REGISTER."
* commit '24374e575285e1f7950293469bca7a3410e46fea':
  Remove ARCH_ARM_HAVE_TLS_REGISTER.
2015-02-17 17:58:49 +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
d2d9747199 am b89ec381: am 070eea05: am ffd4fee9: Merge "Revert "Allow system images larger than 2GiB."" into lmp-mr1-dev
* commit 'b89ec38113a22d09b0832ed2d3cb8fc413a14a75':
  Revert "Allow system images larger than 2GiB."
2015-02-13 20:44:23 +00: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
6368a18bb7 Merge "Load cts/build/config.mk after build/core/config.mk" 2015-02-13 18:33:49 +00:00
Ying Wang
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
Miao Wang
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
Stuart Scott
4d88a3639b Merge "Split the build of the CTS infrastructure from the tests." 2015-02-13 17:26:20 +00:00
Jean-Philippe Lesot
5c938ffb33 Merge "Force make to check date of classes.jack after Jack run" 2015-02-13 01:09:09 +00:00
Miao Wang
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
Ying Wang
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
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
c2b6d3b32e am b5a3e2fe: am 8f1965ed: Merge "Remove gdbclient from envsetup."
* commit 'b5a3e2fe9d85523f9e0ea3a0311ce7607b97a194':
  Remove gdbclient from envsetup.
2015-02-12 21:36:33 +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
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
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
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
Ying Wang
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
JP Abgrall
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
bohu
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
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
Michael Runge
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
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
Stuart Scott
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
Narayan Kamath
af439891e9 Merge "Temporarily add org.apache.http.legacy to the boot classpath." 2015-02-11 14:48:03 +00:00
smain@google.com
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
Andres Morales
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
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
Jorim Jaggi
050f21cb00 Merge "Split up android.policy into framework.jar and services.jar 3/3" 2015-02-10 14:15:20 +00:00
Narayan Kamath
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