Treehugger Robot
48d610ab18
Merge "Remove reference to deleted gzip module"
2017-07-07 01:34:40 +00:00
Colin Cross
b9e74ba400
Add test config for memunreachable_test
...
Test: none
Change-Id: Ieb297a2fcece6365a074cd470b3ca56e2baea926
2017-07-07 01:07:05 +00:00
Android Build Merger (Role)
6efd7e65a7
Merge "Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp am: bb3d4e579c" into oc-dr1-dev-plus-aosp am: a9be33b6b5"
2017-07-07 00:09:41 +00:00
Android Build Merger (Role)
cd678d9bb7
Merge "Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp am: bb3d4e579c" into oc-dr1-dev-plus-aosp am: e62a5014b5"
2017-07-07 00:09:27 +00:00
Steven Moreland
1aecbdb634
Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp am: bb3d4e579c" into oc-dr1-dev-plus-aosp
...
am: e62a5014b5
2017-07-07 00:08:45 +00:00
Steven Moreland
1618c25baf
Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp am: bb3d4e579c" into oc-dr1-dev-plus-aosp
...
am: a9be33b6b5
2017-07-07 00:08:43 +00:00
Android Build Merger (Role)
afeacbc69c
Merge "Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp am: b3341eef52" into oc-dr1-dev-plus-aosp am: 4911a79078"
2017-07-07 00:08:32 +00:00
Android Build Merger (Role)
6112849c3c
Merge "Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp am: bb3d4e579c" into oc-dr1-dev-plus-aosp am: a9be33b6b5"
2017-07-07 00:08:21 +00:00
Steven Moreland
b2f225c234
Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp am: bb3d4e579c" into oc-dr1-dev-plus-aosp
...
am: a9be33b6b5
2017-07-07 00:07:35 +00:00
Steven Moreland
9822b483d2
Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp am: b3341eef52" into oc-dr1-dev-plus-aosp
...
am: 4911a79078
2017-07-07 00:07:28 +00:00
Android Build Merger (Role)
b81d6557e0
Merge "Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp am: b3341eef52" into oc-dr1-dev-plus-aosp am: 15c4cdf9da"
2017-07-07 00:07:15 +00:00
Android Build Merger (Role)
82b11ed218
Merge "Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp am: b3341eef52" into oc-dr1-dev-plus-aosp am: 4911a79078"
2017-07-07 00:07:12 +00:00
Steven Moreland
16cf0acf2b
Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp am: b3341eef52" into oc-dr1-dev-plus-aosp
...
am: 4911a79078
2017-07-07 00:06:34 +00:00
Steven Moreland
2d7a510ddd
Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp am: b3341eef52" into oc-dr1-dev-plus-aosp
...
am: 15c4cdf9da
2017-07-07 00:05:57 +00:00
Android Build Merger (Role)
bd3c69add1
Merge "Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp am: b3341eef52" into oc-dr1-dev-plus-aosp am: 15c4cdf9da"
2017-07-07 00:05:54 +00:00
Android Build Merger (Role)
a45b49840f
Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34 am: 1921ab7c0e" into oc-dev-plus-aosp am: 7f895b1438" into oc-dr1-dev-plus-aosp am: 04d18ab666"
2017-07-07 00:05:45 +00:00
Steven Moreland
7aacad7414
Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp am: b3341eef52" into oc-dr1-dev-plus-aosp
...
am: 15c4cdf9da
2017-07-07 00:05:02 +00:00
Steven Moreland
75e32665ba
Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34 am: 1921ab7c0e" into oc-dev-plus-aosp am: 7f895b1438" into oc-dr1-dev-plus-aosp
...
am: 04d18ab666
2017-07-07 00:04:46 +00:00
Steven Moreland
5517d55a99
Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34 am: 1921ab7c0e" into oc-dev-plus-aosp am: 7f895b1438" into oc-dr1-dev-plus-aosp
...
am: 04d18ab666
2017-07-07 00:03:50 +00:00
Steven Moreland
acf2c2e1d7
Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34 am: 1921ab7c0e" into oc-dev-plus-aosp am: 7f895b1438
...
am: 953f9670ac
2017-07-07 00:02:48 +00:00
Steven Moreland
4ebf6ea2fc
Merge "Move libnativebridge headers into the module." am: 508e0b8b34 am: 1921ab7c0e am: d46cb65ce4
...
am: 3d6bb82263
2017-07-07 00:01:54 +00:00
Andreas Gampe
9c3706f642
Merge "System/core: Remove include/ziparchive" am: ae590fe723 am: 10e80f3715 am: 19fc21698b
...
am: 19b8ab995e
2017-07-07 00:01:24 +00:00
Android Build Merger (Role)
e62a5014b5
Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp am: bb3d4e579c" into oc-dr1-dev-plus-aosp
2017-07-06 23:58:22 +00:00
Steven Moreland
86f70ccb9c
Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp
...
am: bb3d4e579c
2017-07-06 23:58:00 +00:00
Android Build Merger (Role)
a9be33b6b5
Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp am: bb3d4e579c" into oc-dr1-dev-plus-aosp
2017-07-06 23:57:49 +00:00
Android Build Merger (Role)
4911a79078
Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp am: b3341eef52" into oc-dr1-dev-plus-aosp
2017-07-06 23:57:32 +00:00
Steven Moreland
bce71d4de3
Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp
...
am: bb3d4e579c
2017-07-06 23:57:22 +00:00
Steven Moreland
25f10a0fe5
Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp
...
am: b3341eef52
2017-07-06 23:57:04 +00:00
Android Build Merger (Role)
15c4cdf9da
Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp am: b3341eef52" into oc-dr1-dev-plus-aosp
2017-07-06 23:56:49 +00:00
Android Build Merger (Role)
04d18ab666
Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34 am: 1921ab7c0e" into oc-dev-plus-aosp am: 7f895b1438" into oc-dr1-dev-plus-aosp
2017-07-06 23:56:34 +00:00
Steven Moreland
58e95f2ad8
Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp
...
am: b3341eef52
2017-07-06 23:56:23 +00:00
Steven Moreland
8ed203e6cc
Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34 am: 1921ab7c0e" into oc-dev-plus-aosp
...
am: 7f895b1438
2017-07-06 23:56:09 +00:00
Steven Moreland
953f9670ac
Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34 am: 1921ab7c0e" into oc-dev-plus-aosp
...
am: 7f895b1438
2017-07-06 23:55:08 +00:00
Steven Moreland
3d6bb82263
Merge "Move libnativebridge headers into the module." am: 508e0b8b34 am: 1921ab7c0e
...
am: d46cb65ce4
2017-07-06 23:54:03 +00:00
Android Build Merger (Role)
bb3d4e579c
Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp
2017-07-06 23:51:55 +00:00
Android Build Merger (Role)
b3341eef52
Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp
2017-07-06 23:51:34 +00:00
Steven Moreland
18114a6493
Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master
...
am: b3c418e847
2017-07-06 23:51:26 +00:00
Steven Moreland
2ae838ed16
Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master
...
am: b3c418e847
2017-07-06 23:51:07 +00:00
Android Build Merger (Role)
7f895b1438
Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34 am: 1921ab7c0e" into oc-dev-plus-aosp
2017-07-06 23:51:02 +00:00
Steven Moreland
a947566568
Merge "Move libnativebridge headers into the module." am: 508e0b8b34
...
am: 1921ab7c0e
2017-07-06 23:50:33 +00:00
Steven Moreland
d46cb65ce4
Merge "Move libnativebridge headers into the module." am: 508e0b8b34
...
am: 1921ab7c0e
2017-07-06 23:50:18 +00:00
Android Build Merger (Role)
b3c418e847
Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master
2017-07-06 23:47:59 +00:00
Steven Moreland
a931c8aee5
Merge "Move libnativebridge headers into the module."
...
am: 508e0b8b34
2017-07-06 23:47:31 +00:00
Steven Moreland
1921ab7c0e
Merge "Move libnativebridge headers into the module."
...
am: 508e0b8b34
2017-07-06 23:46:57 +00:00
Treehugger Robot
508e0b8b34
Merge "Move libnativebridge headers into the module."
2017-07-06 23:36:34 +00:00
Andreas Gampe
19b8ab995e
Merge "System/core: Remove include/ziparchive" am: ae590fe723 am: 10e80f3715
...
am: 19fc21698b
2017-07-06 23:33:56 +00:00
Andreas Gampe
19fc21698b
Merge "System/core: Remove include/ziparchive" am: ae590fe723
...
am: 10e80f3715
2017-07-06 23:10:24 +00:00
Steven Moreland
58b3c79034
libutils: liblog export headers
...
- make liblog dependency for all library builds (this is required
for files like String8.cpp)
- export liblog headers (because they are used in many header files).
Test: less libraries fail with BOARD_VNDK_VERSION := current
Merged-In: Iecb9cd00deb3a9056ea63c4a087afdb80a51a2b8
Change-Id: Iecb9cd00deb3a9056ea63c4a087afdb80a51a2b8
2017-07-06 22:57:08 +00:00
Andreas Gampe
10e80f3715
Merge "System/core: Remove include/ziparchive"
...
am: ae590fe723
2017-07-06 22:56:34 +00:00
Wei Wang
a04dcd646b
Merge "init: Support custom shutdown actions" into oc-dr1-dev am: cea7028cf4 -s ours
...
am: 85681a27dd
2017-07-06 22:52:51 +00:00
