Scott Main
54f8700faf
Merge "add support for constraint layout's DATA list" into nyc-dev am: 64bd41ff7d
...
am: de4cdad1fd
Change-Id: I8cfd6fefc3938d015a9078788f20060a4400e53e
2016-09-10 01:37:52 +00:00
smain@google.com
0070d17b04
add support for constraint layout's DATA list am: 7055897faa
...
am: bca27e5836
Change-Id: I9689cfe6088637a6702d8bee52835eb7ff19a33c
2016-09-10 01:37:52 +00:00
smain@google.com
4330a151cd
add support for constraint layout's DATA list am: 7055897faa
am: 210083ab97
...
am: 6fee24869b
Change-Id: I422c3feb38337c2426eec264fca0c35a3b99d6ae
2016-09-10 01:37:51 +00:00
Scott Main
01fd07b19d
Merge "add support for constraint layout's DATA list" into nyc-dev am: 64bd41ff7d
...
am: be56d3b2b2
Change-Id: Ie3b6e3504cd6d45e8214e7a688a3f1c5d12100e5
2016-09-10 01:35:21 +00:00
smain@google.com
6fee24869b
add support for constraint layout's DATA list am: 7055897faa
...
am: 210083ab97
Change-Id: Ic55ead4d5ceda3c937a62fd1b82c35b6de60af63
2016-09-10 01:35:21 +00:00
Scott Main
de4cdad1fd
Merge "add support for constraint layout's DATA list" into nyc-dev
...
am: 64bd41ff7d
Change-Id: Iece4de40cbd0854165e39767ef379a4b75fb66b5
2016-09-10 01:33:18 +00:00
smain@google.com
bca27e5836
add support for constraint layout's DATA list
...
am: 7055897faa
Change-Id: Ibce59cf7867e6a197a39873453dae8336419e233
2016-09-10 01:33:17 +00:00
Scott Main
be56d3b2b2
Merge "add support for constraint layout's DATA list" into nyc-dev
...
am: 64bd41ff7d
Change-Id: I93e87b680a6bba3d90de2ef4f8f16bc02afb33ab
2016-09-10 01:32:55 +00:00
smain@google.com
210083ab97
add support for constraint layout's DATA list
...
am: 7055897faa
Change-Id: I9781454790423d51385094aaa530d994cccb1016
2016-09-10 01:32:24 +00:00
Scott Main
64bd41ff7d
Merge "add support for constraint layout's DATA list" into nyc-dev
2016-09-10 01:28:09 +00:00
smain@google.com
7055897faa
add support for constraint layout's DATA list
...
Change-Id: Ia301ad235dcfd5a5c2bb13bfa6daa753f9206800
2016-09-09 15:47:58 -07:00
Dan Stoza
ae5e550f81
Remove DispSync default value/docs
...
Moves DispSync phase offset default values and documentation to
frameworks/native/services/surfaceflinger/Android.mk.
Bug: 30801895
Change-Id: I44a4355b2d112561b94ccfc6e9c3365885c205ad
2016-09-09 13:53:52 -07:00
Colin Cross
b50e65d097
Merge "Remove global linker search paths" am: 39c1c9ae12
am: 01d1c0b442
...
am: 6b7762a458
Change-Id: I216f2ec8c20182745edd25c442360b9303b52ad2
2016-09-09 20:40:29 +00:00
Alan Viverette
9c535433df
Add transition support library to docs path to fix build
...
Change-Id: I277df6af728aea4aaa5b10605cf2a6a44c2a246f
2016-09-09 16:39:18 -04:00
Colin Cross
6b7762a458
Merge "Remove global linker search paths" am: 39c1c9ae12
...
am: 01d1c0b442
Change-Id: Ifd0478970be0ab37374f5445b5a9501a0c041123
2016-09-09 20:37:29 +00:00
Colin Cross
01d1c0b442
Merge "Remove global linker search paths"
...
am: 39c1c9ae12
Change-Id: I3eddb29f5e0c0d4fe3d5bc012c27c11509e3de8d
2016-09-09 20:34:29 +00:00
Colin Cross
39c1c9ae12
Merge "Remove global linker search paths"
2016-09-09 20:27:21 +00:00
Colin Cross
067d781530
Remove global linker search paths
...
Remove the global linker search path, as it can cause spurious build
failures. If a library with the same name as a system library is in the
process of being written to the directory in the global search path, and
the linker may try to read the partially-written built one instead of the
system one. We already use full paths to libraries for target builds,
do the same for host builds. Also remove the normalize library
functions, they are no longer necessary.
Test: m -j checkbuild
Bug: 31393456
Change-Id: If9fc631e111f568c700fd73e103445c30d7e9d11
2016-09-09 11:01:15 -07:00
David Brazdil
70470166c7
Update build rules for VDEX
...
ART now produces a new output file called VDEX, produced alongside the
existing OAT file. This patch updates the relevant build rules.
Bug: 30937355
Change-Id: Ib6be9f8f36c8f061dbbebd72cb55a5d4b6dc27eb
2016-09-09 09:41:10 +01:00
Dan Albert
f5d024d31a
Update NDK gtest lib names.
...
The NDK gtest libs are always suffixed to simplify the make macro
that generates the test modules.
Bug: http://b/16574165
Change-Id: I1c9647e90aff2f1e9da4a88cad30199b1e423757
2016-09-08 23:10:20 -07:00
Dan Willemsen
4dc61a8ce3
Merge "Prevent Kati from seeing MAKEFLAGS" am: 6b363e24bd
am: 01784e0aef
...
am: 27766efeaa
Change-Id: I05282a22526f1f871dccfe9e1689aaa77603cd96
2016-09-09 01:40:51 +00:00
Dan Willemsen
27766efeaa
Merge "Prevent Kati from seeing MAKEFLAGS" am: 6b363e24bd
...
am: 01784e0aef
Change-Id: I751acea9a09e67cb65954502cc562408d948a133
2016-09-09 01:38:22 +00:00
Dan Willemsen
01784e0aef
Merge "Prevent Kati from seeing MAKEFLAGS"
...
am: 6b363e24bd
Change-Id: I8bc18aa66c7b621ed90d82412b6c29e72334f3f1
2016-09-09 01:35:51 +00:00
Treehugger Robot
6b363e24bd
Merge "Prevent Kati from seeing MAKEFLAGS"
2016-09-09 01:25:21 +00:00
Dan Willemsen
5ad9ccaf2a
Prevent Kati from seeing MAKEFLAGS
...
We never want Kati to see MAKEFLAGS, as forcefully overriding variables
is terrible. The variables in MAKEFLAGS are still available in the
environment, so if part of the build wants input from the user, it
should be explicitly checking for an environment variable or using ?=
This commit shouldn't actually change any behavior -- the version of
Kati checked into our tree doesn't actually read MAKEFLAGS (the latest
version does, which is why this change is necessary). We're also already
clearing MAKEFLAGS during makeparallel, so the USE_GOMA case already
doesn't pass through MAKEFLAGS.
Test: Manual $(warnings $(origin MYTEST) $(MYTEST)) with old and new Kati
Change-Id: I5e4ffa66b3539a539cc7a26da24645b11445c469
2016-09-08 17:14:43 -07:00
Dan Willemsen
4dc664081d
Merge "Blacklist the GOMACC_PATH environment variable" am: b2498a22c2
am: 4e3e6c76d0
...
am: e67d3d1c36
Change-Id: Iab2457c07acd730091dd120b4ad7ebdf7fafe062
2016-09-08 20:57:35 +00:00
Dan Willemsen
e67d3d1c36
Merge "Blacklist the GOMACC_PATH environment variable" am: b2498a22c2
...
am: 4e3e6c76d0
Change-Id: Iec477fd5002a486d266b2926b21f901f5c8abf30
2016-09-08 20:55:04 +00:00
Dan Willemsen
4e3e6c76d0
Merge "Blacklist the GOMACC_PATH environment variable"
...
am: b2498a22c2
Change-Id: I987d05196b3b15f5019f7a9497867fa9c39cec12
2016-09-08 20:52:34 +00:00
Dan Willemsen
b2498a22c2
Merge "Blacklist the GOMACC_PATH environment variable"
2016-09-08 20:47:19 +00:00
Chih-hung Hsieh
e28fd9f2e4
Merge "Define DEFAULT_TIDY_HEADER_DIRS." am: 9d66e2c2ef
am: 84be3dc50a
...
am: 59ac695071
Change-Id: I3df291e91d5d4a222f0bebc9bbc7291a89ad5d79
2016-09-08 20:39:34 +00:00
Chih-hung Hsieh
59ac695071
Merge "Define DEFAULT_TIDY_HEADER_DIRS." am: 9d66e2c2ef
...
am: 84be3dc50a
Change-Id: I2d331c92195714935093171af16bfde0788cca43
2016-09-08 20:37:03 +00:00
Chih-hung Hsieh
84be3dc50a
Merge "Define DEFAULT_TIDY_HEADER_DIRS."
...
am: 9d66e2c2ef
Change-Id: Ifbcded2a3d1f0852ba348fc7954e835c05760d5a
2016-09-08 20:34:34 +00:00
Chih-hung Hsieh
9d66e2c2ef
Merge "Define DEFAULT_TIDY_HEADER_DIRS."
2016-09-08 20:24:07 +00:00
Dan Willemsen
c4f595e88f
Blacklist the GOMACC_PATH environment variable
...
The clang compiler wrapper will be looking for this environment
variable, but it should only ever be set by the `gomacc` in CC_WRAPPER.
Make sure that it isn't otherwise set in the environment.
Change-Id: I4b26c7183bc47f71dffa7dfcc2e5b08e840a11b1
2016-09-08 12:45:15 -07:00
Alex Klyubin
d6acfd5767
Merge ""SignApk" in Created-By header" am: 6e85eeaf53
am: 1989b26783
...
am: c16afc3e6e
Change-Id: I87fae3aca5c6b6736620dadb8567512a6757c115
2016-09-08 17:23:01 +00:00
Alex Klyubin
c16afc3e6e
Merge ""SignApk" in Created-By header" am: 6e85eeaf53
...
am: 1989b26783
Change-Id: Ie6ba1f239e36ee671ae9b5973bef6f1b8f584b5a
2016-09-08 17:20:36 +00:00
Alex Klyubin
1989b26783
Merge ""SignApk" in Created-By header"
...
am: 6e85eeaf53
Change-Id: I5b87f9655b88bdeed5ccfccbf5b76e94243592f6
2016-09-08 17:18:01 +00:00
Treehugger Robot
6e85eeaf53
Merge ""SignApk" in Created-By header"
2016-09-08 17:10:37 +00:00
Colin Cross
6cf278c499
Merge "Build symlinks for -host and -target phony modules" am: d81559e6ac
am: cf94d1dbdc
...
am: ed5343b8ac
Change-Id: I88fcdd916676801403767aa686c165691ef372e1
2016-09-07 22:09:53 +00:00
Colin Cross
ed5343b8ac
Merge "Build symlinks for -host and -target phony modules" am: d81559e6ac
...
am: cf94d1dbdc
Change-Id: If14c8e7ca133f737638b48f70657903cca6d9a7e
2016-09-07 22:07:18 +00:00
Colin Cross
cf94d1dbdc
Merge "Build symlinks for -host and -target phony modules"
...
am: d81559e6ac
Change-Id: I133cae0be0a8328af1b9b186e7d47e4f46a11406
2016-09-07 22:05:18 +00:00
Treehugger Robot
d81559e6ac
Merge "Build symlinks for -host and -target phony modules"
2016-09-07 22:00:24 +00:00
Colin Cross
aaf888a09a
Build symlinks for -host and -target phony modules
...
Move extra module dependencies like symlinks from dependencies of
$(my_register_name) to $(my_all_targets), and make $(my_register_name)
and other convenience phony modules depend on $(my_all_targets). Move
$(LOCAL_MODULE)-host/-target to depend on $(my_all_targets) instead of
directly depending on the built and installed modules.
Change-Id: I3b093986db7a1bff118f1f2482275f0997a98fb6
2016-09-07 14:03:32 -07:00
Alex Klyubin
969e354b1f
"SignApk" in Created-By header
...
The switch to apksig changed the Created-By header value in .SF file
from "1.0 (Android SignApk)" to "1.0 (Android apksigner)". This commit
reverts the value back to "1.0 (Android SignApk)".
Change-Id: I2fc462cade40a5b31bb6191996fd6f18fabbf08f
2016-09-07 13:21:00 -07:00
Casey Dahlin
2ceedbee92
Merge "Add tool to copy files in to fat16 images" am: bfea84dabc
am: f061b906e4
...
am: 1da082d2c5
Change-Id: Ia13845de77d1750c7ba54de13d06ed0eb55b8ac9
2016-09-07 20:09:10 +00:00
Casey Dahlin
1da082d2c5
Merge "Add tool to copy files in to fat16 images" am: bfea84dabc
...
am: f061b906e4
Change-Id: Ia3988e59b82245ffa41b92a5df057cada1ac6154
2016-09-07 20:06:41 +00:00
Casey Dahlin
f061b906e4
Merge "Add tool to copy files in to fat16 images"
...
am: bfea84dabc
Change-Id: I9647fc5f7b96370a74e603cdd3fb29021e7905a6
2016-09-07 20:04:13 +00:00
Treehugger Robot
bfea84dabc
Merge "Add tool to copy files in to fat16 images"
2016-09-07 19:51:06 +00:00
Chih-hung Hsieh
db3a22cd84
Merge "Recognize new clang-tidy and Java warnings." am: 0c9a2ee864
am: 7df7722f2a
...
am: 77a81d5e96
Change-Id: I9928bc1231be5df2931ec227ffdc9b2e720f34c6
2016-09-07 05:40:35 +00:00
Chih-hung Hsieh
77a81d5e96
Merge "Recognize new clang-tidy and Java warnings." am: 0c9a2ee864
...
am: 7df7722f2a
Change-Id: I6ee8322bea222340457ce1245844f5e2e6a426dc
2016-09-07 05:38:05 +00:00