Martin Stjernholm
019d501145
Merge "Add libnativebridge.so link to vndk_lite linker config." am: 0b6d56e68b am: 8f13a7f400
...
am: 8da4c5243c
Change-Id: Icdcd1889df0031fc1541f623ca9539ede5287c56
2019-01-29 00:39:18 -08:00
Tom Cherry
f7d7e16d3c
Merge "fs_mgr: remove old fs_mgr functions that are not currently used" am: 2648b801ed am: acf95ae6d4
...
am: 3ef8a6575f
Change-Id: I3546fcb6b4b0433adabf8fd16f33c39fddaaedd0
2019-01-28 23:57:34 -08:00
Martin Stjernholm
8da4c5243c
Merge "Add libnativebridge.so link to vndk_lite linker config." am: 0b6d56e68b
...
am: 8f13a7f400
Change-Id: I9f8708a66775f2758a36f90b5a94da01280a1263
2019-01-28 23:05:33 -08:00
Tom Cherry
3ef8a6575f
Merge "fs_mgr: remove old fs_mgr functions that are not currently used" am: 2648b801ed
...
am: acf95ae6d4
Change-Id: Id52aebb44ff620a5f200ac3386e71abf88189c53
2019-01-28 22:34:09 -08:00
Steven Moreland
9587ea753e
Merge "Move clang-formats to build." am: 66853db0a2 am: 9edd9ebe1d
...
am: 0d9c2b3991
Change-Id: I96b1b1356b2789ae2456b929766d83170c242603
2019-01-28 22:19:45 -08:00
Greg Kaiser
7beedaf0a5
Merge "adb: Fix incorrect logging statement" am: 32aaba6dcf am: d13559092c
...
am: c5ba3e1014
Change-Id: If4e5a98de613f84d14b74b7307865ec42f217d3d
2019-01-28 22:18:26 -08:00
Tom Cherry
d8058ca840
Merge changes Ibdecf0c9,I41bd92a7,I5669ed10 am: 561498e357 am: 80fba27032
...
am: 308f20ba24
Change-Id: I31821adb600a302c8f0d06fb638c7d4c8cc06f13
2019-01-28 22:17:32 -08:00
Steven Moreland
0d9c2b3991
Merge "Move clang-formats to build." am: 66853db0a2
...
am: 9edd9ebe1d
Change-Id: I7170a1d515f7ce0c4c15c69da46db6f7ce9c005d
2019-01-28 21:39:28 -08:00
Martin Stjernholm
8f13a7f400
Merge "Add libnativebridge.so link to vndk_lite linker config."
...
am: 0b6d56e68b
Change-Id: Ic558af4547212e35e8725a0dab7db1b762cf9afd
2019-01-28 21:39:07 -08:00
Greg Kaiser
c5ba3e1014
Merge "adb: Fix incorrect logging statement" am: 32aaba6dcf
...
am: d13559092c
Change-Id: Ie9c66e2fc1d74172b3f2420c4d9dc9b7ba7d0c5a
2019-01-28 21:38:40 -08:00
Tom Cherry
308f20ba24
Merge changes Ibdecf0c9,I41bd92a7,I5669ed10 am: 561498e357
...
am: 80fba27032
Change-Id: Ideebaff704419c9a97d066ca97ead40935779118
2019-01-28 21:37:59 -08:00
Tom Cherry
acf95ae6d4
Merge "fs_mgr: remove old fs_mgr functions that are not currently used"
...
am: 2648b801ed
Change-Id: Id5cdb57603ccbf58f6c0cda3f071bbb27fabfe93
2019-01-28 21:34:02 -08:00
Steven Moreland
9edd9ebe1d
Merge "Move clang-formats to build."
...
am: 66853db0a2
Change-Id: I005a7e056c9050ec927f59a7f195ddc3f7d39773
2019-01-28 20:09:07 -08:00
Greg Kaiser
d13559092c
Merge "adb: Fix incorrect logging statement"
...
am: 32aaba6dcf
Change-Id: I7900ad07fceb4472744ca0d0c159960dde9dfabf
2019-01-28 20:08:32 -08:00
Tom Cherry
80fba27032
Merge changes Ibdecf0c9,I41bd92a7,I5669ed10
...
am: 561498e357
Change-Id: Ia0ba17bfee3d97dd4390f942ec7931c2b7a68ea6
2019-01-28 20:07:59 -08:00
Treehugger Robot
0b6d56e68b
Merge "Add libnativebridge.so link to vndk_lite linker config."
2019-01-28 22:49:15 +00:00
TreeHugger Robot
d0afd8f9f5
Merge "Add graphics-base-v1.2 autogen headers"
2019-01-28 22:21:51 +00:00
Treehugger Robot
2648b801ed
Merge "fs_mgr: remove old fs_mgr functions that are not currently used"
2019-01-28 20:27:23 +00:00
Treehugger Robot
66853db0a2
Merge "Move clang-formats to build."
2019-01-28 20:16:54 +00:00
Treehugger Robot
32aaba6dcf
Merge "adb: Fix incorrect logging statement"
2019-01-28 20:10:50 +00:00
Martin Stjernholm
626c7ca588
Add libnativebridge.so link to vndk_lite linker config.
...
Getting it back in line with the normal ld.config.txt. This was missed in
http://r.android.com/854740 .
Test: Flash and boot on marlin
Bug: 119867084
Bug: 113373927
Change-Id: Ic7e482133250eda20ff2c94c27bdee30e015ab5c
2019-01-28 19:11:29 +00:00
chenbruce
919554343f
Merge "Linker namespace configuration for the Resolv APEX." am: 2d3ef2a22f am: c114fa270d
...
am: 17cc1c07cc
Change-Id: I43bf5b8960003d5a012f87a349e680599bb8e792
2019-01-28 09:09:09 -08:00
Tom Cherry
2f0331d9b6
fs_mgr: remove old fs_mgr functions that are not currently used
...
New code should be using the new Fstab class, so remove these older
functions that don't have current users.
Test: build
Change-Id: I3ba2b12b838b4b46979963869939fd4b65264738
2019-01-28 09:06:10 -08:00
Tom Cherry
561498e357
Merge changes Ibdecf0c9,I41bd92a7,I5669ed10
...
* changes:
fs_mgr: test parsing all mount and fs mgr options
fs_mgr: convert parse_flags over to C++
fs_mgr: store file_contents_mode and file_names_mode directly
2019-01-28 16:52:25 +00:00
chenbruce
17cc1c07cc
Merge "Linker namespace configuration for the Resolv APEX." am: 2d3ef2a22f
...
am: c114fa270d
Change-Id: Ibaa49c2d1c994e4062fd56cda8a5ed05354a6a69
2019-01-28 08:43:49 -08:00
chenbruce
c114fa270d
Merge "Linker namespace configuration for the Resolv APEX."
...
am: 2d3ef2a22f
Change-Id: I8762937b9fce9c87f4b12903a5923973238e739d
2019-01-28 08:20:04 -08:00
Treehugger Robot
2d3ef2a22f
Merge "Linker namespace configuration for the Resolv APEX."
2019-01-28 15:21:52 +00:00
Greg Kaiser
fdb9800fcc
adb: Fix incorrect logging statement
...
We were logging "fd.get()" after we had already done a
"std::move(fd)". That won't log the value we were hoping for.
We instead cache the file descriptor value in a local int prior
to the move(), and log that.
Test: TreeHugger
Change-Id: I715874ac63329280ffb55881fb2590fb31dc2457
2019-01-28 06:17:44 -08:00
Nicolas Geoffray
9fa65fc307
Merge "Make runtime namespace visible." am: 3ea7785ee9 am: 79c48f1a83
...
am: 5e3f606bf4
Change-Id: Id4dfdc3f7a7229ee8bfe315b9830432768fab467
2019-01-28 01:57:52 -08:00
Nicolas Geoffray
5e3f606bf4
Merge "Make runtime namespace visible." am: 3ea7785ee9
...
am: 79c48f1a83
Change-Id: Idf39f173275cb6721bc5972ffd37be57847df9f1
2019-01-28 01:35:34 -08:00
Nicolas Geoffray
79c48f1a83
Merge "Make runtime namespace visible."
...
am: 3ea7785ee9
Change-Id: I74058f6dd78784359a87603ab5002c07656b4443
2019-01-28 01:29:27 -08:00
Nicolas Geoffray
3ea7785ee9
Merge "Make runtime namespace visible."
2019-01-28 09:16:21 +00:00
chenbruce
aa87fd5f7d
Linker namespace configuration for the Resolv APEX.
...
Support netd to load resolv Apex.
Switch namespaces when switching library paths between
/system and the APEX, so that internal library dependencies in both
locations are loaded from their own directory.
Bug: 119527674
Test: make; flash; lsof -p $(pidof netd)
Test: 1. manual test datacall/wifi work
2. manual test tethering work
3. system/netd/tests/runtests.sh
Change-Id: I3f69e85f2f529636f0ef29a2d9d71ad582c46dfb
2019-01-28 16:42:58 +08:00
Hridya Valsaraju
5843cb1c5b
Merge "Make 'fastboot boot' command support boot header version 2" am: b44996bfa9 am: 863e8fb3b7
...
am: 88693e5be7
Change-Id: Ibbfa3431ca5cad5855a67826b5c8d632dad26967
2019-01-27 21:51:14 -08:00
Hridya Valsaraju
88693e5be7
Merge "Make 'fastboot boot' command support boot header version 2" am: b44996bfa9
...
am: 863e8fb3b7
Change-Id: If3f29c4bf71a2752f07963788a4c73a0c065549a
2019-01-27 21:47:00 -08:00
Hridya Valsaraju
863e8fb3b7
Merge "Make 'fastboot boot' command support boot header version 2"
...
am: b44996bfa9
Change-Id: I81239dd72347ebbe5360c2bcf9c158c84dd8cb79
2019-01-27 21:40:54 -08:00
Treehugger Robot
b44996bfa9
Merge "Make 'fastboot boot' command support boot header version 2"
2019-01-28 05:34:52 +00:00
Emilian Peev
43c59ca7e2
Add graphics-base-v1.2 autogen headers
...
Graphics headers generated by:
hidl-gen -Lexport-header -o
$ANDROID_BUILD_TOP/system/core/include/system/graphics-base-v1.2.h
android.hardware.graphics.common@1.2
Bug: 109735087
Test: Android builds successfully
Change-Id: Ie847fdd808ed0daaea917d705a8dc51c6633142a
2019-01-27 20:08:27 -08:00
Kevin DuBois
48c93ba788
Merge "libcore: add definitions from graphics.commons@1.2"
2019-01-28 03:57:37 +00:00
Christopher Ferris
42b9c96ea0
Merge "Add GetPrintableBuildID()." am: 49047d711b am: 8bd4aa963a
...
am: 7d605a8cb7
Change-Id: I4cccefe80db54e9f6699cd42718e3038d3eb3667
2019-01-25 23:18:04 -08:00
Christopher Ferris
7d605a8cb7
Merge "Add GetPrintableBuildID()." am: 49047d711b
...
am: 8bd4aa963a
Change-Id: Iac1eefa53aba2fb4a9553b1b0de6510befc603fd
2019-01-25 23:13:51 -08:00
Christopher Ferris
8bd4aa963a
Merge "Add GetPrintableBuildID()."
...
am: 49047d711b
Change-Id: If23b529363e07473a498896ef493565f7a4cecb5
2019-01-25 23:09:38 -08:00
Christopher Ferris
5b1d0126d9
Merge "Add a few leak check tests." am: ed7ca8bb14 am: 9a96618c9d
...
am: 1efb1601bf
Change-Id: I767c90822b24520666d3a17f23a334a08b1555dd
2019-01-25 23:04:57 -08:00
Christopher Ferris
49047d711b
Merge "Add GetPrintableBuildID()."
2019-01-26 07:03:35 +00:00
Christopher Ferris
1efb1601bf
Merge "Add a few leak check tests." am: ed7ca8bb14
...
am: 9a96618c9d
Change-Id: I2966cccd7712c04c95be5090b1e96d8600b3d5d4
2019-01-25 22:59:44 -08:00
Christopher Ferris
9a96618c9d
Merge "Add a few leak check tests."
...
am: ed7ca8bb14
Change-Id: Icae3c879ca1abbd556a08d494556da14e92f2c12
2019-01-25 22:55:35 -08:00
Christopher Ferris
ed7ca8bb14
Merge "Add a few leak check tests."
2019-01-26 06:45:39 +00:00
Jiyong Park
6d7affb54f
Merge "Remove permitted path for non-isolated namespace" am: ce17f19bc8 am: 8f6b3ed826
...
am: d7add90cd3
Change-Id: I08debb40a730cf511b1e02c21db46bd7dd29e305
2019-01-25 22:19:43 -08:00
Jiyong Park
d7add90cd3
Merge "Remove permitted path for non-isolated namespace" am: ce17f19bc8
...
am: 8f6b3ed826
Change-Id: Icaf906a27a1c88703dfda3431a573d3d010370fc
2019-01-25 22:15:33 -08:00
Jiyong Park
8f6b3ed826
Merge "Remove permitted path for non-isolated namespace"
...
am: ce17f19bc8
Change-Id: Ib81fa94e013c48eb155069438d701c75cff92950
2019-01-25 22:11:24 -08:00