Miao Wang
302e944c60
[RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets.
...
Bug: 22796994
Bug: 22693954
This change fixes the RS_PREBUILT_LIBPATH when used with 64-bit target
devices. It also fixes an issue where the target RenderScript API is
below 21 for 64-bit compilation. In those cases, we should always
upconvert it to 21 (since that is the first available 64-bit release).
Change-Id: I27e9d0bd5c01bac0b3b28e9002333264a55d628f
2015-07-28 19:30:20 -07:00
Ying Wang
c671a7cf5c
Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
...
- Don't overwrite [TARGET|HOST]_[CC|CXX] with the [CC|CXX]_WRAPPER prefix,
so that we can disable the wrapper per module.
- Disable ccache on a module when FDO is enabled.
Bug: 22612634
Change-Id: Ibc04a4742d589955066c7eceb43a0da9a2b893bc
2015-07-20 21:26:53 -07:00
Mohamad Ayyash
914811a9f2
Merge "Add img2simg in host and ota packages" into mnc-dev
2015-06-24 23:13:51 +00:00
Mohamad Ayyash
353265b081
Add img2simg in host and ota packages
...
Change-Id: Ide660cf3cf69c74bbd15d0ac6642b60d58f076fa
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-06-24 23:01:27 +00:00
C. Sean Young
6f44670ada
am cbaead4c: am 540772fa: am cf469989: Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
...
* commit 'cbaead4cfe737c96c649672b6c1396c35597b5b7':
Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
2015-06-12 17:43:46 +00:00
C. Sean Young
cbaead4cfe
am 540772fa: am cf469989: Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
...
* commit '540772fa2287e63a0c745229fb72b78903c9cd70':
Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
2015-06-12 16:29:25 +00:00
C. Sean Young
cf4699895a
Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
...
These directories are excluded in addition to OUT_DIR.
This can be useful if your build system has other output directories
beyond what OUT_DIR is set to.
Change-Id: I6d98a85bcc8c89279e939406a7fec32547e8922f
2015-06-10 13:00:13 -05:00
Ying Wang
589e8c52fb
Use TARGET_DEFAULT_JAVA_LIBRARIES instead of just framework.
...
- When raising the ProGuard sdk version for platform build, use
TARGET_DEFAULT_JAVA_LIBRARIES instead of just framework.
- Also added SUPPORT_LIBRARY_ROOT to reference support library resource
dir.
Bug: 20658265
Change-Id: Ib008d8e70508723db91431a062cac691367f2f6c
2015-05-19 16:03:57 -07:00
Yohann Roussel
b6bfb5893a
Save Jack default extra args in a file
...
Change-Id: I059b36fc71679eb5c95f05ede26d8037c742921b
2015-05-18 09:44:49 +02:00
Dmitriy Ivanov
be55caf288
am 6f2935dc: am dabf96ab: am c84b3a78: am 648f1b66: Merge "Pack relocation tables for dynamic executables"
...
* commit '6f2935dc1432a38e149498b6efbd43ed9aceb827':
Pack relocation tables for dynamic executables
2015-04-23 23:16:36 +00:00
Dmitriy Ivanov
4c2d1a64fb
Pack relocation tables for dynamic executables
...
Add replocation-packer step for dynmic executables.
Enable it by default for arm and arm64 platforms.
Bug: http://b/18051137
Change-Id: I0c88fd31595bcea62a087f219acb9ecf9c80f2e5
2015-04-23 12:07:16 -07:00
Dimitry Ivanov
bc83d0bb68
am 893ed24d: am 387a9fee: am 941d61de: am 1ff47c7f: Merge "Revert "Pack relocation tables for all dynamic executables""
...
* commit '893ed24dd7cec9b560fe46862b3635efa327ec65':
Revert "Pack relocation tables for all dynamic executables"
2015-04-23 05:07:11 +00:00
Dimitry Ivanov
1eca10fa9d
Revert "Pack relocation tables for all dynamic executables"
...
This reverts commit e7a1b8a0c6
.
Change-Id: I1a2185e1c68d364941e3b3e525a8c4a7a42e0cc1
2015-04-23 04:22:33 +00:00
Dmitriy Ivanov
943381b7df
am ff084258: am b7b27621: am 64119a7f: am ec6a9773: Merge "Pack relocation tables for all dynamic executables"
...
* commit 'ff084258ea53c414d724ba87f89c324056def1bd':
Pack relocation tables for all dynamic executables
2015-04-23 03:42:44 +00:00
Dmitriy Ivanov
e7a1b8a0c6
Pack relocation tables for all dynamic executables
...
Bug: http://b/18051137
Change-Id: I277277d5f5eb450ef9b4a23cfec16d75d977eb89
2015-04-22 13:30:43 -07:00
Dmitriy Ivanov
594c0868d4
resolved conflicts for merge of 6cb3732d
to master
...
Change-Id: I6415638ccde1e78f74ae5d9527dc696d40f15e5f
2015-04-20 14:08:43 -07:00
Dmitriy Ivanov
4eb120b999
Remove unsupported *_COMPRESS_MODULE_SYMBOLS
...
Change-Id: Ibb7da2997a0bb5b9f435213c9d3206bc4aad18db
2015-04-20 12:24:12 -07:00
Yohann Roussel
77cbe10fd9
Use Jack launcher
...
Bug: 20132430
Change-Id: I6e30ad3dffbb32824a4c62e562359b084e6a8784
2015-04-15 12:29:01 +02:00
Yohann Roussel
e163b4e2e8
Revert "Ignore ANDROID_JACK_VM_ARGS and ANDROID_JACK_EXTRA_ARGS"
...
This reverts commit d191667006
.
Build server are no longer giving outdated options.
Change-Id: Idece7efc45bb42a39364f721a7e6a576705dc926
2015-04-09 10:10:21 +00:00
Yohann Roussel
d191667006
Ignore ANDROID_JACK_VM_ARGS and ANDROID_JACK_EXTRA_ARGS
...
This is a temporrary workaround allowing to ignore outdated options
given by the build server that may cause OutOfMemoryError when
running Jack server.
Change-Id: I1b6b956de09faaeee1bf6a25c2a63124b69e2645
2015-04-07 23:43:36 +02:00
Yohann Roussel
abee3a9f41
Don't call Jack directly, use the script instead
...
Change-Id: Ic9d4aa3cb543ab748423f4ea0d060544a4ea44e6
2015-04-07 23:42:53 +02:00
Rom Lemarchand
93dda7cd8c
Add the new audio include path on the list of default includes
...
Change-Id: If40ba57cb97f86802c2872772672a380afc4d947
2015-04-03 15:09:11 -07:00
David Riley
17be3d3921
Add support to sign boot images with vboot.
...
Change-Id: I924468fe06f7d38d4fc49c2ae9dfee734fd58867
Signed-off-by: David Riley <davidriley@google.com>
(cherry picked from commit 14fb7236c1942a9f5050b3e608a0f5f4cd1cae1d)
2015-03-26 17:54:40 +00:00
Yohann Roussel
ec46a3b71f
Turn off Jack warnings by default
...
Change-Id: I24b3135395483b3581d212cb2ab1bb93ba2524d9
2015-03-20 15:40:07 +01:00
Yohann Roussel
76a5e0bd1a
Use java -jar ... instead of java -cp ...
...
When running Jack or Jill.
Change-Id: I2127f183f8f033a9d35a7e8247a9432252a58bc8
2015-03-17 17:03:22 +01:00
Ying Wang
e9f0226655
Apply jack redirection flag to also custom ANDROID_JACK_EXTRA_ARGS
...
Bug: 19715777
Change-Id: I4ad9c9f51bf418afe29f5a682f630d6071cd33a2
2015-03-16 11:59:41 -07:00
Ying Wang
f738b3bb9f
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
(cherry picked from commit bacf5f8008
)
2015-03-16 10:56:03 -07:00
Yohann Roussel
1ccaa8fbd8
Merge "Make Jack use tmp dir specified by TMPDIR"
2015-03-16 17:08:01 +00:00
Yohann Roussel
f528e132d6
Make Jack use tmp dir specified by TMPDIR
...
If the environment variable is defined.
Bug: 19654122
Change-Id: Ib238a2c2eb60296a96de98a4a54e0996d4c8a958
2015-03-16 15:59:33 +01:00
Yohann Roussel
c76d99dca1
Redirect jack warnings to stdout
...
Bug: 19715777
Change-Id: If651a35f3579dd6e976eeb8a063b0eefdfaa992a
2015-03-13 17:59:05 +01:00
Christopher Ferris
390f9fdc07
am f3382443: am 46ba5456: am 708b56ed: Merge "Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty."
...
* commit 'f3382443cde82feeb1ceee32a2538f96fba44b80':
Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty.
2015-03-08 00:12:48 +00:00
Christopher Ferris
9de4d5ebb3
Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty.
...
On non-arm architectures, there is no TARGET_CPU_VARIANT set. For x86,
art assumes that the CPU variant is actually the TARGET_ARCH_VARIANT.
Therefore, if no TARGET_CPU_VARIANT is set, use the TARGET_ARCH_VARIANT.
If TARGET_ARCH_VARIANT is not set, then use default as the value.
Change-Id: I17fc9e3ac7412462103b8f0b287fce106298b741
2015-03-06 10:19:12 -08:00
Mohamad Ayyash
b97746ef09
Allow flashing a squashfs system image
...
Change-Id: Ic51d11274784a8d2e9d57d5f0b821ebc89680e5a
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-03-03 18:54:50 -08:00
Mohamad Ayyash
6894695819
Allow flashing a squashfs system image
...
Change-Id: Ic51d11274784a8d2e9d57d5f0b821ebc89680e5a
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-03-03 15:14:37 -08:00
Dan Albert
b4cca80999
am 9ddc52c1: am 13baa319: am 876f45e7: Merge "Make some warnings impossible to override."
...
* commit '9ddc52c1e4d2111346b865e72019b98cb9562d57':
Make some warnings impossible to override.
2015-02-25 23:32:47 +00:00
Dan Albert
876f45e73f
Merge "Make some warnings impossible to override."
2015-02-25 23:13:13 +00:00
Colin Cross
46aceb2363
am de6a0bd5: am 841e4cf2: am a82f7db9: Merge "add BUILD_NATIVE_BENCHMARK"
...
* commit 'de6a0bd545cae62bab4bc91a2de670044b9219ec':
add BUILD_NATIVE_BENCHMARK
2015-02-25 17:00:12 +00:00
Colin Cross
a82f7db900
Merge "add BUILD_NATIVE_BENCHMARK"
2015-02-24 20:49:56 +00:00
Dan Albert
0c91fa84ff
Make some warnings impossible to override.
...
These CFLAGS and CPPFLAGS will always be added last, and are
controlled by the build system. This way we can add warnings that
users are not allowed to disable.
Change-Id: Id71f69249078f62ca2687ecbf764aff0fd3a1c1b
2015-02-23 10:05:51 -08:00
Yohann Roussel
95573d5036
Enable jack multithreading
...
Jack multithreading offer significant compile time improvement of
single project compilation and the problems it causes can be
avoided using "-j -l XX" instead of "-j YY" when running make.
Change-Id: I323f3d287467df1b598ceab6521cc71b329e0008
2015-02-19 11:14:56 +01: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
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
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
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
65d4186f85
Remove mkyaffs2image references.
...
Change-Id: I1d112515bc92353a5b48ec668e1cadfb51ecdaad
2015-02-04 19:58:09 -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
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
Miao Wang
a3edd760d3
am 50ef9040: am 2b942f87: Merge "Add build rules for libRSSupportIO (Usage_IO lib for RS compat lib)"
...
* commit '50ef904068c37792015040c1c28a117fafe328a6':
Add build rules for libRSSupportIO (Usage_IO lib for RS compat lib)
2015-01-16 16:50:15 +00:00
Miao Wang
962dd8a012
am de00ebbe: am caf44db2: Merge "Add build rules for 64bit Renderscript Compat lib."
...
* commit 'de00ebbe24185237a1056fde39cfc839534e31da':
Add build rules for 64bit Renderscript Compat lib.
2015-01-09 17:52:49 +00:00
Miao Wang
ec27a8966c
Add build rules for libRSSupportIO (Usage_IO lib for RS compat lib)
...
bug 12924018
Change-Id: I35af72c1f7788f9fd9cb24bfabdbbad09e865a8b
2015-01-09 09:43:09 -08:00