OSDN Git Service
Dan Willemsen [Wed, 4 Jan 2017 23:10:36 +0000 (23:10 +0000)]
Merge changes from topic 'build-vts-zip' am:
d0c693ff64 am:
a50ead8336
am:
d63d5fffcd
Change-Id: I174d13d97cb54760688e5b4cd1fe79e1a5553e9f
Keun Soo Yim [Wed, 4 Jan 2017 23:10:30 +0000 (23:10 +0000)]
delete vts.mk (which is moved to test/vts) am:
18a316c161 am:
ed61c29cfd
am:
f1125508ba
Change-Id: Ib803efe818f406d5e12e408969902114ed2c5b30
Keun Soo Yim [Wed, 4 Jan 2017 23:10:25 +0000 (23:10 +0000)]
include VTS packaging task files am:
b74649d027 am:
33f6d707fa
am:
03616abb42
Change-Id: I0e134d05415e5bd79c4e8c16795ddb66a8d05501
Dan Willemsen [Wed, 4 Jan 2017 23:08:37 +0000 (23:08 +0000)]
Merge changes from topic 'build-vts-zip' am:
d0c693ff64
am:
a50ead8336
Change-Id: I409e26a885e5361a23c6bbae9c8fc994e45f7fcd
Keun Soo Yim [Wed, 4 Jan 2017 23:08:31 +0000 (23:08 +0000)]
delete vts.mk (which is moved to test/vts) am:
18a316c161
am:
ed61c29cfd
Change-Id: If7f214225e07c3b5789d2d79b808c432c92fee27
Keun Soo Yim [Wed, 4 Jan 2017 23:08:25 +0000 (23:08 +0000)]
include VTS packaging task files am:
b74649d027
am:
33f6d707fa
Change-Id: Ia84408c4ea3215acefd3f666525df397d868fc52
Dan Willemsen [Wed, 4 Jan 2017 23:05:35 +0000 (23:05 +0000)]
Merge changes from topic 'build-vts-zip'
am:
d0c693ff64
Change-Id: Ic2b1d3165c4da7d89080f3016286a4a7ed815b2b
Keun Soo Yim [Wed, 4 Jan 2017 23:05:34 +0000 (23:05 +0000)]
delete vts.mk (which is moved to test/vts)
am:
18a316c161
Change-Id: I1853517cff9d3697143b8c5c2fd6459e502040c4
Keun Soo Yim [Wed, 4 Jan 2017 23:05:29 +0000 (23:05 +0000)]
include VTS packaging task files
am:
b74649d027
Change-Id: I94d3ceb03b7815b49291ca127fdd41a8affca8fe
Dan Willemsen [Wed, 4 Jan 2017 22:58:53 +0000 (22:58 +0000)]
Merge changes from topic 'build-vts-zip'
* changes:
delete vts.mk (which is moved to test/vts)
include VTS packaging task files
Keun Soo Yim [Fri, 2 Sep 2016 18:43:43 +0000 (11:43 -0700)]
delete vts.mk (which is moved to test/vts)
Test: m -j vts
Change-Id: I3ab29e59b6f77f3ac92bbfe7a6f7a8f36b2ba3bd
(cherry picked from commit
a942dc8433c4e02bdfe0313471bcac8fef318fde)
Keun Soo Yim [Wed, 31 Aug 2016 16:20:51 +0000 (09:20 -0700)]
include VTS packaging task files
Test: m -j vts
Change-Id: I8737412bf4e7b5c2db32325105e7c588949b959d
(cherry picked from commit
199a710f73d9522b599ff75b8dc8ea54e7fcf6e0)
Hung-ying Tyan [Wed, 4 Jan 2017 02:50:18 +0000 (02:50 +0000)]
Merge "Define TARGET_OUT_VENDOR_APPS_PRIVILEGED for 2nd arch" am:
1a4a0a4539 am:
82e3d0d007
am:
150db0ea6f
Change-Id: I1b0fddf2b72e47a38bdac605819dbab4f6f2dd84
Hung-ying Tyan [Wed, 4 Jan 2017 02:48:19 +0000 (02:48 +0000)]
Merge "Define TARGET_OUT_VENDOR_APPS_PRIVILEGED for 2nd arch" am:
1a4a0a4539
am:
82e3d0d007
Change-Id: I65daac2e70657ae651a705d3768555ab1b727d05
Hung-ying Tyan [Wed, 4 Jan 2017 02:46:19 +0000 (02:46 +0000)]
Merge "Define TARGET_OUT_VENDOR_APPS_PRIVILEGED for 2nd arch"
am:
1a4a0a4539
Change-Id: Ic1bee5c763d5375c676f96db273d3126c85dd85b
Treehugger Robot [Wed, 4 Jan 2017 02:44:04 +0000 (02:44 +0000)]
Merge "Define TARGET_OUT_VENDOR_APPS_PRIVILEGED for 2nd arch"
Elliott Hughes [Wed, 4 Jan 2017 00:46:10 +0000 (00:46 +0000)]
Merge "fs_config: Fix oem range parsing" am:
ce6c8e629f am:
c16a64b832
am:
d7217e2847
Change-Id: Ibb5896d37c2ca354e35d392cebde8ad22b6e60f8
Elliott Hughes [Wed, 4 Jan 2017 00:44:11 +0000 (00:44 +0000)]
Merge "fs_config: Fix oem range parsing" am:
ce6c8e629f
am:
c16a64b832
Change-Id: Iafb13daaa210eea2c19e11eb1d9b2d94a5d047bb
Elliott Hughes [Wed, 4 Jan 2017 00:41:40 +0000 (00:41 +0000)]
Merge "fs_config: Fix oem range parsing"
am:
ce6c8e629f
Change-Id: I74d198a2638b875233859a1c7ff723b04b47a353
Elliott Hughes [Wed, 4 Jan 2017 00:37:58 +0000 (00:37 +0000)]
Merge "fs_config: Fix oem range parsing"
Tao Bao [Tue, 3 Jan 2017 23:52:22 +0000 (23:52 +0000)]
Merge "blockimgdiff.py: Clean up stash id computation in BBOTA v3+." am:
7cfc591596 am:
74b665fef1
am:
085daa6451
Change-Id: I0304bebe8645c4f95925d28e38f91184395a8b29
Tao Bao [Tue, 3 Jan 2017 23:50:20 +0000 (23:50 +0000)]
Merge "blockimgdiff.py: Clean up stash id computation in BBOTA v3+." am:
7cfc591596
am:
74b665fef1
Change-Id: I4d9b7eb0c73faee8c7044690750560840fa4d820
Tao Bao [Tue, 3 Jan 2017 23:48:21 +0000 (23:48 +0000)]
Merge "blockimgdiff.py: Clean up stash id computation in BBOTA v3+."
am:
7cfc591596
Change-Id: Ifaf7f387b840d9f3e59bdbf93beab41a245f7ed5
Tao Bao [Tue, 3 Jan 2017 23:44:41 +0000 (23:44 +0000)]
Merge "blockimgdiff.py: Clean up stash id computation in BBOTA v3+."
Richard Uhler [Tue, 3 Jan 2017 10:00:46 +0000 (10:00 +0000)]
Merge "Remove option for non-pic dex preopt." am:
c184ef515c am:
ffb29d7497
am:
8a02582f70
Change-Id: I85e5b259300d15f9e2ba5825cc5efb33066f3baf
Richard Uhler [Tue, 3 Jan 2017 09:52:16 +0000 (09:52 +0000)]
Merge "Remove option for non-pic dex preopt." am:
c184ef515c
am:
ffb29d7497
Change-Id: I15c5c9f03f33a02a7f39e781e5e945fe5c74f4bd
Richard Uhler [Tue, 3 Jan 2017 09:44:21 +0000 (09:44 +0000)]
Merge "Remove option for non-pic dex preopt."
am:
c184ef515c
Change-Id: If76f8195ecb8b914fdea259de2e80ebebb5ebfe3
Treehugger Robot [Tue, 3 Jan 2017 09:39:38 +0000 (09:39 +0000)]
Merge "Remove option for non-pic dex preopt."
Johan Redestig [Tue, 3 Jan 2017 08:36:47 +0000 (09:36 +0100)]
fs_config: Fix oem range parsing
Addresses the following build error:
"value" not in valid range [], got: 2901 for: "AID_ABC" file:\
"device/somc/abc/config.fs"
that happens when parsing device/somc/abc/config.fs:
[AID_ABC]
value: 2901
The problem is that the AID.PREFIX is 'AID_' so the _OEM_RANGE
expression is searching for AID__OEM_RESERVED, which never
exists. Drop the extra '_'.
Change-Id: I8a1556731e14e49cef66e3e91121e4be23a308e0
Test: ./build/tools/fs_config/fs_config_generator.py fsconfig --aid-header=system/core/include/private/android_filesystem_config.h device/somc/abc/config.fs
Tao Bao [Wed, 28 Dec 2016 17:14:39 +0000 (09:14 -0800)]
blockimgdiff.py: Clean up stash id computation in BBOTA v3+.
Only BBOTA v2 needs to maintain a pool of available 'stash slot id'.
BBOTA v3+ uses the hash of the stashed blocks as the slot id, which
doesn't need the id pool anymore.
Bug:
33694544
Test: Generate v2 and v4 incrementals w/ and w/o the CL. They produce
the same packages respectively.
Change-Id: I8121af5b6b1bee98c3639d54a00b06fd12e378e8
Elliott Hughes [Tue, 27 Dec 2016 21:16:08 +0000 (21:16 +0000)]
Merge "Revert "Revert "Merge changes from topic 'fsconfig-2'""" am:
5f60b74297 am:
71f582ac30
am:
9d5a9e7c6e
Change-Id: I2af7cd105fa6e200ed28156f83c30c57b66f6d3c
Elliott Hughes [Tue, 27 Dec 2016 21:15:54 +0000 (21:15 +0000)]
Revert "Revert "Merge changes from topic 'fsconfig-2'"" am:
2d7c86dfea am:
feb4f2e54a
am:
8a2ed5159c
Change-Id: I7ff77ba1282fbddedbd10a3a63b055ac36ee83ae
Elliott Hughes [Tue, 27 Dec 2016 21:09:07 +0000 (21:09 +0000)]
Merge "Revert "Revert "Merge changes from topic 'fsconfig-2'""" am:
5f60b74297
am:
71f582ac30
Change-Id: If090fbd6fef18dbed6258d58c7aa45d6ace27e14
Elliott Hughes [Tue, 27 Dec 2016 21:08:52 +0000 (21:08 +0000)]
Revert "Revert "Merge changes from topic 'fsconfig-2'"" am:
2d7c86dfea
am:
feb4f2e54a
Change-Id: I5e6d138662e8f21f85e77466f897ffab9afd0f2d
Elliott Hughes [Tue, 27 Dec 2016 21:01:24 +0000 (21:01 +0000)]
Merge "Revert "Revert "Merge changes from topic 'fsconfig-2'"""
am:
5f60b74297
Change-Id: Ib88d2780ee2a7ba0b070087cc1ed8921f4247100
Elliott Hughes [Tue, 27 Dec 2016 21:01:23 +0000 (21:01 +0000)]
Revert "Revert "Merge changes from topic 'fsconfig-2'""
am:
2d7c86dfea
Change-Id: I825336a18f7d7525bb49dd65d24ddccbfef84ba5
Elliott Hughes [Tue, 27 Dec 2016 20:51:06 +0000 (20:51 +0000)]
Merge "Revert "Revert "Merge changes from topic 'fsconfig-2'"""
Alan Viverette [Fri, 23 Dec 2016 03:21:05 +0000 (03:21 +0000)]
Merge "Update pathmap.mk for renderscript support library migration" am:
cafc7efee0 am:
7621a86097
am:
670a4b4fa6
Change-Id: Ibae6e9e2b0eed11390b3d36970894952116c1a90
Alan Viverette [Fri, 23 Dec 2016 03:15:04 +0000 (03:15 +0000)]
Merge "Update pathmap.mk for renderscript support library migration" am:
cafc7efee0
am:
7621a86097
Change-Id: I9adc6741d91caf5c575c11070b2277a50c3dc940
Alan Viverette [Fri, 23 Dec 2016 03:08:34 +0000 (03:08 +0000)]
Merge "Update pathmap.mk for renderscript support library migration"
am:
cafc7efee0
Change-Id: Ic85e61e12524b46073a0fd3b092eb42bc6d5c283
Treehugger Robot [Fri, 23 Dec 2016 03:02:54 +0000 (03:02 +0000)]
Merge "Update pathmap.mk for renderscript support library migration"
Alan Viverette [Fri, 23 Dec 2016 01:44:29 +0000 (01:44 +0000)]
Update pathmap.mk for renderscript support library migration am:
b78260919d
am:
e8b339d1d3
Change-Id: Ibe6eee89e8e1d847f42d1a79eb7ccb6d2fe39d8a
Alan Viverette [Fri, 23 Dec 2016 01:38:28 +0000 (01:38 +0000)]
Update pathmap.mk for renderscript support library migration
am:
b78260919d
Change-Id: Ic8bdcfa3e55cb6b1f501efbff9aee9304811f41f
Alan Viverette [Tue, 26 Jul 2016 17:06:37 +0000 (13:06 -0400)]
Update pathmap.mk for renderscript support library migration
Bug:
30255901
Change-Id: I213baaf4c76a7e5b8d20168624b74eb61582d215
(cherry picked from commit
49f03349c818de16be3a0c74f6dc07c85b94b7b0)
Colin Cross [Fri, 23 Dec 2016 01:02:06 +0000 (01:02 +0000)]
Merge "Update pathmap.mk for renderscript support library migration" into nyc-mr1-dev-plus-aosp
am:
5b0573233f
Change-Id: Ie35be50e72068a71bc0e5cb64c48da529a60ffb2
Alan Viverette [Fri, 23 Dec 2016 01:01:56 +0000 (01:01 +0000)]
Update pathmap.mk for renderscript support library migration
am:
74b13397d9
Change-Id: I503654db7c70d6785e9b2559e9709fb06177733e
Alan Viverette [Tue, 26 Jul 2016 17:06:37 +0000 (13:06 -0400)]
Update pathmap.mk for renderscript support library migration
Bug:
30255901
Change-Id: I213baaf4c76a7e5b8d20168624b74eb61582d215
(cherry picked from commit
49f03349c818de16be3a0c74f6dc07c85b94b7b0)
Colin Cross [Fri, 23 Dec 2016 00:54:32 +0000 (00:54 +0000)]
Merge "Update pathmap.mk for renderscript support library migration" into nyc-mr1-dev-plus-aosp
Dan Willemsen [Thu, 22 Dec 2016 23:45:17 +0000 (23:45 +0000)]
Merge "Remove --ignore_dirty=$(OUT_DIR)/% from Kati flags" am:
fb2efba189 am:
952d5adcde
am:
bbf841d45f
Change-Id: I0086eb66a855525560c3b962773350c221f9bb3d
Dan Willemsen [Thu, 22 Dec 2016 23:39:47 +0000 (23:39 +0000)]
Merge "Remove --ignore_dirty=$(OUT_DIR)/% from Kati flags" am:
fb2efba189
am:
952d5adcde
Change-Id: I57b99cf8d157dbcf8f10e8d1d4b56a8529d1354f
Dan Willemsen [Thu, 22 Dec 2016 23:33:46 +0000 (23:33 +0000)]
Merge "Remove --ignore_dirty=$(OUT_DIR)/% from Kati flags"
am:
fb2efba189
Change-Id: I63dd0ac17a099ac6da5e8e63be280983e042a839
Dan Willemsen [Thu, 22 Dec 2016 23:27:37 +0000 (23:27 +0000)]
Merge "Remove --ignore_dirty=$(OUT_DIR)/% from Kati flags"
Alan Viverette [Tue, 26 Jul 2016 17:06:37 +0000 (13:06 -0400)]
Update pathmap.mk for renderscript support library migration
Bug:
30255901
Change-Id: I213baaf4c76a7e5b8d20168624b74eb61582d215
(cherry picked from commit
49f03349c818de16be3a0c74f6dc07c85b94b7b0)
Alan Viverette [Tue, 26 Jul 2016 17:06:37 +0000 (13:06 -0400)]
Update pathmap.mk for renderscript support library migration
Bug:
30255901
Change-Id: I213baaf4c76a7e5b8d20168624b74eb61582d215
(cherry picked from commit
49f03349c818de16be3a0c74f6dc07c85b94b7b0)
Dan Willemsen [Sat, 10 Sep 2016 06:18:22 +0000 (23:18 -0700)]
Remove --ignore_dirty=$(OUT_DIR)/% from Kati flags
We really should be re-running Kati when a file in here changes, since
it may actually affect the result. The general problem we've run into is
when there are two kati output files that are clean according to the
current rules, but if they actually ran we'd force an installclean.
This also had the side-effect of not running shell commands that touched
$OUT_DIR, like writing files using $(shell echo ... >out/...), now those
may be run.
This will cause Kati to re-read the makefiles more often -- twice when a
CleanSpec.mk changes, twice when switching products on the same device.
Basically every time we read the old state, do something about it, and
write out the new state, we need to rerun the next time so we aren't
continuously cleaning up what changed.
Bug:
30947985
Test: Manual, switching between configurations; enable --regen_debug
Change-Id: I888f9f8295f318f8214b2c79525cf94f457a5a8b
Dan Willemsen [Thu, 22 Dec 2016 21:41:49 +0000 (21:41 +0000)]
Merge "Fix incremental builds with AAPT2" am:
d25d80e193 am:
b99d4b9e55
am:
59ac51ee24
Change-Id: I78e58b155cee575e5313effb642d3843ef9d75cc
Steven Moreland [Thu, 22 Dec 2016 21:40:43 +0000 (21:40 +0000)]
Merge "embedded.mk: +android.hidl.memory@1.0-service" am:
c1a11ec83f am:
fbeb6b5f8f
am:
cfeaa71933
Change-Id: I0dd9004b41917caba17adc5af2a263212eef3da3
Dan Willemsen [Thu, 22 Dec 2016 21:37:04 +0000 (21:37 +0000)]
Merge "Fix incremental builds with AAPT2" am:
d25d80e193
am:
b99d4b9e55
Change-Id: Ia623c9d0dddd26478174044c83c3eab34edc322b
Steven Moreland [Thu, 22 Dec 2016 21:35:42 +0000 (21:35 +0000)]
Merge "embedded.mk: +android.hidl.memory@1.0-service" am:
c1a11ec83f
am:
fbeb6b5f8f
Change-Id: I4ceba4ea994f9c9304f7c54c16cf373f0170ac22
Dan Willemsen [Thu, 22 Dec 2016 21:31:32 +0000 (21:31 +0000)]
Merge "Fix incremental builds with AAPT2"
am:
d25d80e193
Change-Id: Iaee5e4d0588fcf15c73005f3ca68c5db51dcc5b7
Steven Moreland [Thu, 22 Dec 2016 21:30:13 +0000 (21:30 +0000)]
Merge "embedded.mk: +android.hidl.memory@1.0-service"
am:
c1a11ec83f
Change-Id: Ib83eb02579543c0ad4b0954c9632cc26cd568d85
Dan Willemsen [Thu, 22 Dec 2016 21:28:24 +0000 (21:28 +0000)]
Merge "Fix incremental builds with AAPT2"
Treehugger Robot [Thu, 22 Dec 2016 21:20:36 +0000 (21:20 +0000)]
Merge "embedded.mk: +android.hidl.memory@1.0-service"
Dan Willemsen [Thu, 22 Dec 2016 21:17:17 +0000 (13:17 -0800)]
Fix incremental builds with AAPT2
When we removed the src/ directory, the R.stamp file was removed -- with
AAPT, this triggers src/android/Manifest.java to be regenerated. But
AAPT2 only uses the R.stamp file as a timestamp to find the
Manifest.java file, not to create it.
So add a new CleanSpec.mk to fix the builds by removing the target that
AAPT2 uses to generate the src/android/Manifest.java file.
Test: None
Change-Id: If56f326ad701f7f92aa7c8aeda57e92d9c62cff9
Dan Willemsen [Thu, 22 Dec 2016 20:47:36 +0000 (20:47 +0000)]
Merge "Support non-gtest NATIVE_TESTS" am:
561b0a3753 am:
1ef5112475
am:
4ad881c067
Change-Id: Id4968904ba43183e38c04aa3cc83754bd599c1fb
Dan Willemsen [Thu, 22 Dec 2016 20:42:06 +0000 (20:42 +0000)]
Merge "Support non-gtest NATIVE_TESTS" am:
561b0a3753
am:
1ef5112475
Change-Id: I7c16881f0efb637bf13a0af1e4c89640d7e218e6
Dan Willemsen [Thu, 22 Dec 2016 20:36:06 +0000 (20:36 +0000)]
Merge "Support non-gtest NATIVE_TESTS"
am:
561b0a3753
Change-Id: I2da6eb4db2e4ee03b2699c60540f79b580a1fad0
Dan Willemsen [Thu, 22 Dec 2016 20:30:06 +0000 (20:30 +0000)]
Merge "Remove generated java source post clean logic" am:
f57aa792c3 am:
5208e4f473
am:
5ae5671a3b
Change-Id: Id43b680d5297ea0f3bcff3cbd42e6b16b50de167
Dan Willemsen [Thu, 22 Dec 2016 20:29:41 +0000 (20:29 +0000)]
Merge "Support non-gtest NATIVE_TESTS"
Dan Willemsen [Thu, 22 Dec 2016 20:24:35 +0000 (20:24 +0000)]
Merge "Remove generated java source post clean logic" am:
f57aa792c3
am:
5208e4f473
Change-Id: I18c9cf7fa19346e08d25d9fcba3b5538a7bf1127
Dan Willemsen [Thu, 22 Dec 2016 20:18:35 +0000 (20:18 +0000)]
Merge "Remove generated java source post clean logic"
am:
f57aa792c3
Change-Id: I03b0b0368cd3e5500d60981c06135490af8eb3a9
Treehugger Robot [Thu, 22 Dec 2016 20:09:13 +0000 (20:09 +0000)]
Merge "Remove generated java source post clean logic"
Steven Moreland [Thu, 15 Dec 2016 20:30:23 +0000 (12:30 -0800)]
embedded.mk: +android.hidl.memory@1.0-service
This is the service that provides shared memory for hidl/treble
processes.
Bug:
32185232
Test: builds
Change-Id: I79162a781daad7aa704f4ee071fef0bbdea59a18
Dan Willemsen [Thu, 22 Dec 2016 01:37:00 +0000 (17:37 -0800)]
Remove generated java source post clean logic
Just move the proto and renderscript sources into their own directories
-- the entire directory is wiped if the file list changes since the
command line will change. So we can just enable/disable pulling sources
from those directories based on whether there were files in the list or
not.
Bug:
30947985
Test: m -j java
Test: Remove a proto file from a java lib, ensure the generated source
is not included.
Change-Id: If7529979de6fa62a651933a3a974f47b033851d6
Vijay Venkatraman [Thu, 22 Dec 2016 06:13:30 +0000 (06:13 +0000)]
Merge "Revert "Revert "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set.""" am:
0c29ffb74d am:
01fa928500
am:
029741e4a8
Change-Id: I491bb7a8928691b85da1ed2dba53ecf339bafdd4
Vijay Venkatraman [Thu, 22 Dec 2016 06:13:17 +0000 (06:13 +0000)]
Revert "Revert "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set."" am:
43a7f0c765 am:
b3ada4048f
am:
64a1b146af
Change-Id: Ia5dda34e4fae98f0fe7dbe0b4a402d6cb45c1fc7
Vijay Venkatraman [Thu, 22 Dec 2016 06:09:00 +0000 (06:09 +0000)]
Merge "Revert "Revert "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set.""" am:
0c29ffb74d
am:
01fa928500
Change-Id: Iec4bb1e049e1c531744a3aeeed074488e22a3e34
Vijay Venkatraman [Thu, 22 Dec 2016 06:08:46 +0000 (06:08 +0000)]
Revert "Revert "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set."" am:
43a7f0c765
am:
b3ada4048f
Change-Id: Iebc8f31f1d8bd5fab5557a706f8d2d25d97e507a
Vijay Venkatraman [Thu, 22 Dec 2016 06:03:17 +0000 (06:03 +0000)]
Merge "Revert "Revert "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set."""
am:
0c29ffb74d
Change-Id: Idd3792357787a0265aca742fd82439dad394a2e7
Vijay Venkatraman [Thu, 22 Dec 2016 06:03:16 +0000 (06:03 +0000)]
Revert "Revert "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set.""
am:
43a7f0c765
Change-Id: Ie5bfee7624066314f3446c8eeb5e7d202702016e
Vijay Venkatraman [Thu, 22 Dec 2016 05:54:02 +0000 (05:54 +0000)]
Merge "Revert "Revert "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set."""
Vijay Venkatraman [Tue, 20 Dec 2016 17:50:21 +0000 (17:50 +0000)]
Revert "Revert "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set.""
This reverts commit
823172e209ab92dbae6dd5a4ef750f73dbfc5aa8.
Test: build.ninja for any target doesnt change, unless
BOARD_VNDK_VERSION is turned on in BoardConfig.mk
Change-Id: I4e1baaf5a2251de20f71a47096ce53e23d7e2d80
Dan Willemsen [Thu, 22 Dec 2016 04:27:06 +0000 (20:27 -0800)]
Support non-gtest NATIVE_TESTS
We've had this in Soong for a while, but never supported it in Make.
Bug:
33819328
Test: Change LOCAL_GTEST on a module, check m -j ... showcommands
Change-Id: Id8f4b9908c82c05d9a986a38945b33bac578e991
Tao Bao [Wed, 21 Dec 2016 06:27:53 +0000 (06:27 +0000)]
Merge "HOST_OUT_EXECUTABLES path is not needed in misc_info file" am:
376c0146b3 am:
7def52bfe8
am:
f2cffd6849
Change-Id: I7c43d7d46b4ea22e30c3ae36bc65408985df8783
Tao Bao [Wed, 21 Dec 2016 06:22:52 +0000 (06:22 +0000)]
Merge "HOST_OUT_EXECUTABLES path is not needed in misc_info file" am:
376c0146b3
am:
7def52bfe8
Change-Id: I4473d91d021fc17bd3412bae0967a68dc7283aff
Tao Bao [Wed, 21 Dec 2016 06:17:22 +0000 (06:17 +0000)]
Merge "HOST_OUT_EXECUTABLES path is not needed in misc_info file"
am:
376c0146b3
Change-Id: I97065c6e4e0a6d90dde92b96deb97f520b83c21b
Tao Bao [Wed, 21 Dec 2016 06:08:23 +0000 (06:08 +0000)]
Merge "HOST_OUT_EXECUTABLES path is not needed in misc_info file"
Tao Bao [Wed, 21 Dec 2016 04:46:48 +0000 (04:46 +0000)]
Merge "otatools: added missing shared library for make_ext4fs" am:
0ced0a1f50 am:
372a877659
am:
b6f7b14c0e
Change-Id: Icb8c38c7f2440664c02c14d1c7b04ba03e7949b5
Tao Bao [Wed, 21 Dec 2016 04:41:17 +0000 (04:41 +0000)]
Merge "otatools: added missing shared library for make_ext4fs" am:
0ced0a1f50
am:
372a877659
Change-Id: I5cc501bd8f78cb4b1611bbc7e0e3b0a58bfd91f4
Tao Bao [Wed, 21 Dec 2016 04:35:46 +0000 (04:35 +0000)]
Merge "otatools: added missing shared library for make_ext4fs"
am:
0ced0a1f50
Change-Id: I6586f71273ff21a6f9ca44cfba6808248e62bd3b
Tao Bao [Wed, 21 Dec 2016 04:30:26 +0000 (04:30 +0000)]
Merge "otatools: added missing shared library for make_ext4fs"
Mark Salyzyn [Tue, 20 Dec 2016 22:20:23 +0000 (22:20 +0000)]
Merge "logpersist: introduce split to logcat and logpersist domains" am:
04f2cbd92a am:
76b36cfb98
am:
76e0e2a53e
Change-Id: I306a26f8e8b6743b5e6c17c73bcfcb889c2f22e0
Mark Salyzyn [Tue, 20 Dec 2016 22:16:22 +0000 (22:16 +0000)]
Merge "logpersist: introduce split to logcat and logpersist domains" am:
04f2cbd92a
am:
76b36cfb98
Change-Id: Iec4ad75f0cd7d7171b506df7ea529a8152e3f4f5
Mark Salyzyn [Tue, 20 Dec 2016 22:12:29 +0000 (22:12 +0000)]
Merge "logpersist: introduce split to logcat and logpersist domains"
am:
04f2cbd92a
Change-Id: I58f23b14630913eebe8ada09fa23c8ed9fbd90b0
Treehugger Robot [Tue, 20 Dec 2016 22:08:41 +0000 (22:08 +0000)]
Merge "logpersist: introduce split to logcat and logpersist domains"
Hiroshi Yamauchi [Tue, 20 Dec 2016 20:58:42 +0000 (20:58 +0000)]
Merge "Add ART_USE_READ_BARRIER to product variables." am:
e34819ccce am:
f9e277e1fe
am:
9876e6483b
Change-Id: I6a0d6c40edf0a80fb1402068b2ae4b845dcd5da5
Hiroshi Yamauchi [Tue, 20 Dec 2016 20:40:10 +0000 (20:40 +0000)]
Merge "Add ART_USE_READ_BARRIER to product variables." am:
e34819ccce
am:
f9e277e1fe
Change-Id: I4a0addd85f0e1dcc98250a60084f88be118276cc
Mark Salyzyn [Wed, 26 Oct 2016 21:19:32 +0000 (14:19 -0700)]
logpersist: introduce split to logcat and logpersist domains
logcat_exec transition to logpersist from init with perms
Test: compile
Bug:
30566487
Change-Id: I0cea55f71be011e921841ef9d3e1283f11606f36
Hiroshi Yamauchi [Tue, 20 Dec 2016 19:04:19 +0000 (19:04 +0000)]
Merge "Add ART_USE_READ_BARRIER to product variables."
am:
e34819ccce
Change-Id: Iaa92156d93110ddfd1a95f677bc02abc6dbcb5c5
Hiroshi Yamauchi [Tue, 20 Dec 2016 18:56:19 +0000 (18:56 +0000)]
Merge "Add ART_USE_READ_BARRIER to product variables."
OSDN Git Service
