Yohann Roussel
2794e7b582
Check values of LOCAL_JACK_ENABLED
...
And throw an error in case of unknown value.
Change-Id: I5cf6276ac433e0b3af51b30b9dad57b689fa0694
2015-02-23 16:02:32 +01:00
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
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
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
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
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
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
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
Ying Wang
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
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
Andres Morales
5038247772
am 8859f029
: am b998054f
: Merge "Add system/build.prop dependency on vendor/bootimg"
...
* commit '8859f0294979d7be169abe2787ad84044b6714f2':
Add system/build.prop dependency on vendor/bootimg
2015-02-06 18:29:24 +00: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
Sami Tolvanen
431d42f857
Merge "Change transfer list format to include block hashes"
2015-02-06 10:27:11 +00: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
a7442d5219
am 1888ab84
: am 9edd7649
: Merge "Remove mkyaffs2image references."
...
* commit '1888ab842a4308c3898beec434ac59bcda12617b':
Remove mkyaffs2image references.
2015-02-05 20:16:00 +00:00
Elliott Hughes
1888ab842a
am 9edd7649
: Merge "Remove mkyaffs2image references."
...
* commit '9edd76494d4378bd740dd22a2eb4f5d0eb0db40f':
Remove mkyaffs2image references.
2015-02-05 18:47:25 +00:00
Yohann Roussel
c6b44d43c3
Force make to check date of classes.jack after Jack run
...
Bug: 19230260
Change-Id: Ibcbacd9e0630cd295ad262bd152fc070866071d2
2015-02-05 15:27:38 +01:00
Yohann Roussel
9d528c778b
Merge "Engage Jack incremental on demand"
2015-02-05 11:01:22 +00:00
Yohann Roussel
4283c36732
Merge "Simplify handling of ANDROID_JACK_* variables"
2015-02-05 08:37:42 +00:00
Elliott Hughes
65d4186f85
Remove mkyaffs2image references.
...
Change-Id: I1d112515bc92353a5b48ec668e1cadfb51ecdaad
2015-02-04 19:58:09 -08:00
Ying Wang
3e9b20e430
am 16ba2ed8
: resolved conflicts for merge of 4c178ebc
to lmp-mr1-dev-plus-aosp
...
* commit '16ba2ed82bc084d5355477a381cc0bcc8b60a7bd':
Remove support of factory ramdisk/bundle.
2015-02-04 19:33:14 +00:00
Ying Wang
16ba2ed82b
resolved conflicts for merge of 4c178ebc
to lmp-mr1-dev-plus-aosp
...
Change-Id: If84527e9333b855d406dc7ac317868f4cfd3f1f2
2015-02-04 11:28:56 -08:00
Ying Wang
14cc23d433
Remove support of factory ramdisk/bundle.
...
Bug: 18779515
Change-Id: Ia6d51d43965447e2e95944a7d2b4b41adb121cb7
2015-02-04 11:00:01 -08:00
Yohann Roussel
37822c443d
Engage Jack incremental on demand
...
Each module may engage Jack incremental with
LOCAL_JACK_ENABLED := incremental
Include renaming of LOCAL_USE_JACK to LOCAL_JACK_ENABLED that is
now accepting 3 values "disabled", "full" and "incremental".
Change-Id: Icbff275b397bee36b29312e821f3e8d45f83fbcc
2015-02-04 11:22:26 +01:00
Ying Wang
f65bde3e78
am e9bc7b47
: am 4d0f56fb
: Merge "Disable transitive dependency library symbol resolving for mips."
...
* commit 'e9bc7b472db2d54aaef428fc3229b56dbe2bf6fa':
Disable transitive dependency library symbol resolving for mips.
2015-02-03 19:50:01 +00:00
Ying Wang
e9bc7b472d
am 4d0f56fb
: Merge "Disable transitive dependency library symbol resolving for mips."
...
* commit '4d0f56fba3cb89d871e1277d9314da12406394e5':
Disable transitive dependency library symbol resolving for mips.
2015-02-03 19:43:52 +00:00
Ying Wang
624ef02a50
Disable transitive dependency library symbol resolving for mips.
...
The transitive symbol resolving causes build breakage when a binary
linked against NDK has indirect dependency on platform libraries, or
vice versa.
Change-Id: Idbfe76079c1db14eb1156d0f396e13d26f0ff582
2015-02-03 10:58:50 -08:00
Yohann Roussel
2809666941
Simplify handling of ANDROID_JACK_* variables
...
This concerns ANDROID_JACK_VM, ANDROID_JACK_VM_ARGS and
ANDROID_JACK_EXTRA_ARGS.
Change-Id: Iba75ecaaceb09ac9607a3aee41324d9f5ae4beef
2015-02-03 12:37:09 +01:00
Ying Wang
6bcc01a812
Allow to build resource only Java module.
...
Change-Id: I0ccce1f3e336fe25d3b36471664042d1f144c74a
2015-02-02 15:33:31 -08:00
Ying Wang
38a9d5a739
am 10500d0e
: resolved conflicts for merge of 5cb4276e
to lmp-mr1-dev-plus-aosp
...
* commit '10500d0ea7706a6a137e8afdd347d927f5512488':
Add target recoveryimage-nodeps.
2015-01-31 02:00:26 +00:00
Ying Wang
10500d0ea7
resolved conflicts for merge of 5cb4276e
to lmp-mr1-dev-plus-aosp
...
Change-Id: Ia7f011f24276e7e8e045a2544e5dff2b758b1c62
2015-01-30 16:57:37 -08:00
Ying Wang
747b9f18f0
Add target recoveryimage-nodeps.
...
Change-Id: Ie7d11ae8f40260bf23481931c18523895c87ebd7
2015-01-30 14:16:00 -08:00
Ying Wang
5534ade20c
am 385f5e7d
: am 7ecc76a0
: Support dpi specific aapt flags.
...
* commit '385f5e7d090d4721e61d0db60e7287dae8117b77':
Support dpi specific aapt flags.
2015-01-30 21:19:47 +00:00
Ying Wang
385f5e7d09
am 7ecc76a0
: Support dpi specific aapt flags.
...
* commit '7ecc76a0f206c07dfd0db9c81673514a31719d33':
Support dpi specific aapt flags.
2015-01-30 19:34:45 +00:00
Sami Tolvanen
cac671a9d1
Change transfer list format to include block hashes
...
Add source and target block hashes as parameters to transfer list
commands that copy or patch data to a partition. This allows the
updater to verify the status of each command in the transfer list
and makes resuming block based OTAs possible. Due to the changes,
update the transfer list version to 3.
Needs matching changes from
I1e752464134aeb2d396946348e6041acabe13942
Bug: 18262110
Change-Id: Ia5c56379f570047f10f0aa7373a1025439495c98
2015-01-30 11:34:27 +00:00
Ying Wang
7ecc76a0f2
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
2015-01-29 18:08:00 -08:00
Ying Wang
723db51fdb
am 7c05897b
: am e937ac81
: Merge "Add new build flag LOCAL_DONT_DELETE_JAR_DIRS."
...
* commit '7c05897b69801e1945889a9b1a89b86bbbbbdd3a':
Add new build flag LOCAL_DONT_DELETE_JAR_DIRS.
2015-01-29 18:38:00 +00:00
Ying Wang
7c05897b69
am e937ac81
: Merge "Add new build flag LOCAL_DONT_DELETE_JAR_DIRS."
...
* commit 'e937ac814c7f4e1989509f94f7ac8ae5b28a3526':
Add new build flag LOCAL_DONT_DELETE_JAR_DIRS.
2015-01-29 18:05:13 +00:00
Fredrik Roubert
cc93f0c87c
Add new build flag LOCAL_DONT_DELETE_JAR_DIRS.
...
Normally the build function initialize-package-file will delete all
class files and all directory entries from JAR files, but sometimes
external projects (eg. ICU4J) depend on having directory entries in
their JAR files.
This change adds the flag LOCAL_DONT_DELETE_JAR_DIRS (analogous to the
flag LOCAL_DONT_DELETE_JAR_META_INF) which when set will skip deletion
of directory entries in initialize-package-file.
Change-Id: I4464b947b7528fca23925affa95e4071915f04d4
2015-01-29 17:44:27 +00:00
Ying Wang
14bc97f615
am 75705338
: am 1c1497a7
: am cb73599b
: Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES non-fatal.
...
* commit '75705338b7e8e1353503b53f10274fda5c3cf7bf':
Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES non-fatal.
2015-01-28 00:42:49 +00:00
Yabin Cui
5ba2122f77
am d22d6a53
: am 9560d317
: Merge "Kill HAVE_PTHREADS."
...
* commit 'd22d6a537d59e1453bc728810a0694f8871deedc':
Kill HAVE_PTHREADS.
2015-01-28 00:42:42 +00:00