Julien Desprez
84d796dac4
Merge "Temporarily @ignore test_reconnect"
...
am: 9bfa166ad9
Change-Id: I4c95ecf11b2467fc73765a5c6564865c2ee09a3e
2019-02-21 11:55:24 -08:00
Julien Desprez
9bfa166ad9
Merge "Temporarily @ignore test_reconnect"
2019-02-21 18:16:21 +00:00
David Anderson
bf1bcf4cad
Merge "init: Set a property indicating that we're booting into a GSI."
...
am: 1cdd96cb10
Change-Id: I75f4c06514b110b77fef303ef4ba405c0048be53
2019-02-21 06:50:12 -08:00
David Anderson
1cdd96cb10
Merge "init: Set a property indicating that we're booting into a GSI."
2019-02-21 14:40:48 +00:00
Elliott Hughes
963633232e
Merge "__android_log_is_debuggable() shouldn't be an apex symbol"
...
am: 69fc7b628d
Change-Id: I20b8d9710e3d264512443943497528777c3ba594
2019-02-20 22:47:41 -08:00
Elliott Hughes
69fc7b628d
Merge "__android_log_is_debuggable() shouldn't be an apex symbol"
2019-02-21 06:33:47 +00:00
Josh Gao
c8f34c7920
Merge "adb: update symlink timestamps."
...
am: effcb96670
Change-Id: Icb80fca708b8a6e8035bd386703fd23317810776
2019-02-20 18:43:48 -08:00
Josh Gao
effcb96670
Merge "adb: update symlink timestamps."
2019-02-21 02:31:03 +00:00
Yifan Hong
bf3cecfea1
Merge changes from topic "libprocessgroup_json"
...
am: 4bb7b18fe1
Change-Id: Idd640ed97ef2d1d62325ccca73386d562db038d4
2019-02-20 14:07:35 -08:00
Yifan Hong
b9a1840e9b
Move rootdir/*.json to libprocessgroup
...
am: 98a61dd583
Change-Id: I0c37fccffec8f17a519656c941d3b08ec40f1be9
2019-02-20 14:06:31 -08:00
Tom Cherry
66e34e6147
Merge "liblog: add stubs variant"
...
am: 4e47753338
Change-Id: Ib909cd5b88f089839f0f6da9222287cc4dc35fa8
2019-02-20 14:03:38 -08:00
Josh Gao
7b1cb66a83
adb: update symlink timestamps.
...
Bug: http://b/120162375
Test: adb sync; adb shell touch -h -d 2008-01-0101:01:01 /system/bin/ls; adb sync; adb sync
Change-Id: Iedf54528b164913739c66c71d20006e484a4f5e4
2019-02-20 13:17:56 -08:00
Tom Cherry
15800946e0
__android_log_is_debuggable() shouldn't be an apex symbol
...
Remove a superfluous check in fs_mgr, since those return values are
already impossible for a non-debuggable build. Replace a one time
call to __android_log_is_debuggable(), since there's no reason to
cache the value or use this symbol.
Test: build
Change-Id: Icd4bef7b616c49d304303747388d7e3018c6fcfc
2019-02-20 12:52:02 -08:00
Jiyong Park
914c7e9924
Merge "Add the 'unrestricted' config section for vndk_lite devices"
...
am: 14efb903bb
Change-Id: I6aab06e744ab4234fe95ea0302d45bc002a4905d
2019-02-20 12:45:31 -08:00
Yifan Hong
4bb7b18fe1
Merge changes from topic "libprocessgroup_json"
...
* changes:
Add schema for task profiles
Move rootdir/*.json to libprocessgroup
2019-02-20 20:35:47 +00:00
Tom Cherry
4e47753338
Merge "liblog: add stubs variant"
2019-02-20 20:33:36 +00:00
Tom Cherry
fe1f701761
liblog: add stubs variant
...
Ensure that only the symbols in liblog.map.txt can be used by the
platform.
Bug: 123349183
Test: build
Change-Id: I99ae5d0e8ba8f5061ec20701c941d861c9eb615d
2019-02-20 12:32:12 -08:00
Vic Yang
8a4f601c11
Merge "libprocessgroup: Fix memcg path for apps"
...
am: 1cae1b0f81
Change-Id: Ida2fcf3ab528478f438dc35d583da7e535009ed4
2019-02-20 12:29:11 -08:00
Tom Cherry
0cb6e46c18
Merge "init: Ignore "ro." restrictions when reading prop files"
...
am: 86f38d56b8
Change-Id: Ia281e928812d45516d857a2d3f37fd62a9e96cc6
2019-02-20 11:30:25 -08:00
Treehugger Robot
14efb903bb
Merge "Add the 'unrestricted' config section for vndk_lite devices"
2019-02-20 18:12:27 +00:00
Vic Yang
1cae1b0f81
Merge "libprocessgroup: Fix memcg path for apps"
2019-02-20 17:54:16 +00:00
Julien Desprez
fb4c13500f
Temporarily @ignore test_reconnect
...
For the purpose of on-boarding all the other tests,
skip test_reconnect for now.
Test: atest -v adb_integration_test_adb
Bug: 123247844
Change-Id: I50269272adbfc3f946d71bae13677546566d541f
2019-02-20 09:42:49 -08:00
Tom Cherry
86f38d56b8
Merge "init: Ignore "ro." restrictions when reading prop files"
2019-02-20 16:59:39 +00:00
Josh Gao
2eaddf6183
Merge "adbd: log when exiting due to root/unroot/tcpip/usb."
...
am: de3c3e8c76
Change-Id: I12faec705e93600ad93d1ba90069805b8dd48172
2019-02-20 03:57:53 -08:00
Treehugger Robot
de3c3e8c76
Merge "adbd: log when exiting due to root/unroot/tcpip/usb."
2019-02-20 11:40:26 +00:00
Jiyong Park
137e0308b7
Add the 'unrestricted' config section for vndk_lite devices
...
This is essentially the same change as
bcb5ba75a5
for ld.config.vndk_lite.txt.
Bug: 124789446
Test: atest CtsBionicTestCases on marlin
Change-Id: I6b65ec4df1626d625975c9834bf96ac9ff6cc3f3
2019-02-20 16:43:22 +09:00
Kevin Chyn
65999091ae
Merge "Expose libandroidicu to llndk namespace"
...
am: 4275d9b887
Change-Id: I923c452c153d0b855885ac6a286921c63418feab
2019-02-19 22:48:59 -08:00
Kevin Chyn
4275d9b887
Merge "Expose libandroidicu to llndk namespace"
2019-02-20 06:33:21 +00:00
Victor Chang
ff67ef3c7d
Expose libandroidicu to llndk namespace
...
Bug: 124772622
Test: Treehugger
Change-Id: If936eb377c7f0994a9225b8099a672addb2f9ed6
2019-02-20 01:10:06 +00:00
Bowgo Tsai
25ca652133
Merge "Adding GSI fstab entries when needed"
...
am: 2baecf3c8f
Change-Id: I71824eec82427cf5c4a290e0b919952c7e4e6e76
2019-02-19 16:47:44 -08:00
Treehugger Robot
2baecf3c8f
Merge "Adding GSI fstab entries when needed"
2019-02-20 00:36:29 +00:00
Josh Gao
44cac0c1b2
Merge "Hopefully fix more darwin build breakage."
...
am: b8573e2082
Change-Id: I96d92e896b2921a317c54332ec9a9253156984d4
2019-02-19 14:45:17 -08:00
Josh Gao
b8573e2082
Merge "Hopefully fix more darwin build breakage."
2019-02-19 22:38:41 +00:00
Josh Gao
d3387380f7
Hopefully fix more darwin build breakage.
...
Silence narrowing warnings by manually casting to a smaller type,
convert static_asserts to CHECKs, and switch from using MSG_CMSG_CLOEXEC
to manually setting FD_CLOEXEC.
Test: mma
Change-Id: I8aa02804179d754de860279fe34773800b937ab6
2019-02-19 14:37:02 -08:00
Vic Yang
ab8d6ab62d
libprocessgroup: Fix memcg path for apps
...
The expected memcg path for apps is
/dev/memcg/apps/uid_<uid>/pid_<pid>. Right now we are missing the
"apps" component. Fix it.
Bug: 124776663
Test: Boot on a Go device and does not see error from lmkd anymore.
Change-Id: I0e4c1d8520463fabb171ff4e61479034b6446548
2019-02-19 14:09:00 -08:00
Tom Cherry
c031e13664
Merge "load selinux property_contexts in /odm and /product"
...
am: 7e6dc56b85
Change-Id: I336c4850a1d89de0828ef6dccbc5d902243e2726
2019-02-19 13:55:40 -08:00
Tom Cherry
7e6dc56b85
Merge "load selinux property_contexts in /odm and /product"
2019-02-19 21:34:35 +00:00
Josh Gao
dc51803f87
Merge "Fix darwin build break."
...
am: 3ea374f54c
Change-Id: I5de5658169c27aaa753ffa40e13e3e3bf7b31e03
2019-02-19 13:28:06 -08:00
Josh Gao
b1ca42ae28
Merge changes from topic "base_cmsg"
...
am: 8954d0bc98
Change-Id: If51ace5232566f43430a5fb31708a6b20fc4aba1
2019-02-19 13:27:22 -08:00
Yifan Hong
72ff585bd0
Add schema for task profiles
...
- Add proto3 files as schema for JSON task profiles / cgroups
files.
- Add tests to ensure the JSON files (on the device) conforms
the schema. (libprocessgroup_proto_test)
Test: libprocessgroup_proto_test
Bug: 123664216
Change-Id: I1cab73bd0d3852ff8827fee0be22373da8a6fc5b
2019-02-19 13:26:46 -08:00
Josh Gao
3ea374f54c
Merge "Fix darwin build break."
2019-02-19 21:18:46 +00:00
Josh Gao
b57dc7a670
Fix darwin build break.
...
The <malloc.h> include was vestigial from a previous revision.
Test: mma on linux
Change-Id: Iaf8351bec23c2792cefca0e5c9bd42664488f5c4
2019-02-19 13:17:23 -08:00
Josh Gao
a80b64f2a0
adbd: log when exiting due to root/unroot/tcpip/usb.
...
Test: treehugger
Change-Id: Ibfbe4d512c6e126f2e6d311867316f033a4c9ab7
2019-02-19 13:12:59 -08:00
Tom Cherry
be0489281f
init: Ignore "ro." restrictions when reading prop files
...
"ro." properties do not make sense for prop files, especially with the
way that the system/product and vendor/odm partitions are meant to
override each other. To fix this, we ignore the fact that "ro."
properties are "write once" when first loading in property files.
We then adjust the order of property file loading, such that we read
partitions from least to most specific, reading in order: system,
vendor, odm, product, product_services.
Bug: 122864654
Test: ro. properties can override when reading build props with
appropriate permissions
Test: ro. properties do not override when lacking permissions to
be set by a given partition
Change-Id: Ib9a5f77e95d9df647cdde7a5c937bb3425c066fa
2019-02-19 13:02:58 -08:00
Josh Gao
8954d0bc98
Merge changes from topic "base_cmsg"
...
* changes:
adb: switch to base::{Send,Receive}FileDescriptors.
debuggerd: switch to base::{Send,Receive}FileDescriptors.
base: add helpers for sending/receiving file descriptors.
2019-02-19 20:53:01 +00:00
Gavin Corkery
9f6ba484d0
Merge "Rename data/staging to data/pkg_staging."
...
am: e8510cec19
Change-Id: I60f89ba514adb7336c21660a463c8eb50849affe
2019-02-19 12:25:35 -08:00
Gavin Corkery
e8510cec19
Merge "Rename data/staging to data/pkg_staging."
2019-02-19 19:44:13 +00:00
Gavin Corkery
124a4bc791
Rename data/staging to data/pkg_staging.
...
Test: Build and flash, atest apex_e2e_tests
Fixes: 122999313
Change-Id: I878ee41f804956ee7533d64e844ce98e5a8afacc
Merged-In: I878ee41f804956ee7533d64e844ce98e5a8afacc
2019-02-19 15:46:22 +00:00
vichang
055708f26b
Merge changes from topic "dup_icu4c"
...
am: ce912aadda
Change-Id: Ied6cc731e1c57ab48340b5698c669933ed1ac7d7
2019-02-19 02:28:23 -08:00
Victor Chang
2c75b73688
Remove the public libs in runtime namespace
...
am: f70a2fe4c1
Change-Id: I7bf3413685b13a10e146319fbdbd176d31afd00d
2019-02-19 02:27:25 -08:00